@web3auth/no-modal 10.0.0-alpha.0 → 10.0.0-alpha.1

package/dist/lib.cjs/react/no-modal/Web3AuthInnerContext.js

@@ -3,7 +3,7 @@
 var react = require('react');
 var index = require('../../base/errors/index.js');
 var noModal = require('../../noModal.js');
-var constants = require('../../base/adapter/constants.js');
+var constants = require('../../base/connector/constants.js');
 
 const Web3AuthInnerContext = react.createContext(null);
 function Web3AuthInnerProvider(params) {
@@ -22,10 +22,6 @@ function Web3AuthInnerProvider(params) {
   const [isMFAEnabled, setIsMFAEnabled] = react.useState(false);
   const [isInitialized, setIsInitialized] = react.useState(false);
   const [status, setStatus] = react.useState(null);
-  const addPlugin = react.useCallback(plugin => {
-    if (!web3Auth) throw index.WalletInitializationError.notReady();
-    return web3Auth.addPlugin(plugin);
-  }, [web3Auth]);
   const getPlugin = react.useCallback(name => {
     if (!web3Auth) throw index.WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
@@ -40,15 +36,9 @@ function Web3AuthInnerProvider(params) {
     };
     resetHookState();
     const {
-      web3AuthOptions,
-      adapters = [],
-      plugins = []
+      web3AuthOptions
     } = config;
     const web3Instance = new noModal.Web3AuthNoModal(web3AuthOptions);
-    if (adapters.length) adapters.map(adapter => web3Instance.configureAdapter(adapter));
-    if (plugins.length) plugins.forEach(plugin => {
-      web3Instance.addPlugin(plugin);
-    });
     setWeb3Auth(web3Instance);
   }, [config]);
   react.useEffect(() => {
@@ -85,7 +75,7 @@ function Web3AuthInnerProvider(params) {
   // TODO: don't throw error in init, connect in v9
 
   react.useEffect(() => {
-    const notReadyListener = () => setStatus(constants.ADAPTER_STATUS.NOT_READY);
+    const notReadyListener = () => setStatus(constants.CONNECTOR_STATUS.NOT_READY);
     const readyListener = () => {
       setStatus(web3Auth.status);
       setIsInitialized(true);
@@ -93,7 +83,7 @@ function Web3AuthInnerProvider(params) {
     const connectedListener = () => {
       setStatus(web3Auth.status);
       // we do this because of rehydration issues. status connected is fired first but web3auth sdk is not ready yet.
-      if (web3Auth.status === constants.ADAPTER_STATUS.CONNECTED) {
+      if (web3Auth.status === constants.CONNECTOR_STATUS.CONNECTED) {
         setIsInitialized(true);
         setIsConnected(true);
       }
@@ -106,26 +96,26 @@ function Web3AuthInnerProvider(params) {
       setStatus(web3Auth.status);
     };
     const errorListener = () => {
-      setStatus(constants.ADAPTER_STATUS.ERRORED);
+      setStatus(constants.CONNECTOR_STATUS.ERRORED);
     };
     if (web3Auth) {
       // web3Auth is initialized here.
       setStatus(web3Auth.status);
-      web3Auth.on(constants.ADAPTER_EVENTS.NOT_READY, notReadyListener);
-      web3Auth.on(constants.ADAPTER_EVENTS.READY, readyListener);
-      web3Auth.on(constants.ADAPTER_EVENTS.CONNECTED, connectedListener);
-      web3Auth.on(constants.ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-      web3Auth.on(constants.ADAPTER_EVENTS.CONNECTING, connectingListener);
-      web3Auth.on(constants.ADAPTER_EVENTS.ERRORED, errorListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
     }
     return () => {
       if (web3Auth) {
-        web3Auth.off(constants.ADAPTER_EVENTS.NOT_READY, notReadyListener);
-        web3Auth.off(constants.ADAPTER_EVENTS.READY, readyListener);
-        web3Auth.off(constants.ADAPTER_EVENTS.CONNECTED, connectedListener);
-        web3Auth.off(constants.ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-        web3Auth.off(constants.ADAPTER_EVENTS.CONNECTING, connectingListener);
-        web3Auth.off(constants.ADAPTER_EVENTS.ERRORED, errorListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.READY, readyListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
       }
     };
   }, [web3Auth]);
@@ -163,21 +153,10 @@ function Web3AuthInnerProvider(params) {
       setIsConnecting(false);
     }
   }, [web3Auth]);
-  const addAndSwitchChain = react.useCallback(async chainConfig => {
-    if (!web3Auth) throw index.WalletInitializationError.notReady();
-    await web3Auth.addChain(chainConfig);
-    await web3Auth.switchChain({
-      chainId: chainConfig.chainId
-    });
-  }, [web3Auth]);
   const authenticateUser = react.useCallback(async () => {
     if (!web3Auth) throw index.WalletInitializationError.notReady();
     return web3Auth.authenticateUser();
   }, [web3Auth]);
-  const addChain = react.useCallback(async chainConfig => {
-    if (!web3Auth) throw index.WalletInitializationError.notReady();
-    return web3Auth.addChain(chainConfig);
-  }, [web3Auth]);
   const switchChain = react.useCallback(chainParams => {
     if (!web3Auth) throw index.WalletInitializationError.notReady();
     return web3Auth.switchChain(chainParams);
@@ -196,9 +175,6 @@ function Web3AuthInnerProvider(params) {
       enableMFA,
       manageMFA,
       logout,
-      addAndSwitchChain,
-      addChain,
-      addPlugin,
       authenticateUser,
       switchChain,
       isInitializing,
@@ -206,7 +182,7 @@ function Web3AuthInnerProvider(params) {
       initError,
       connectError
     };
-  }, [web3Auth, isConnected, isInitialized, provider, userInfo, isMFAEnabled, status, connectTo, getPlugin, enableMFA, manageMFA, logout, addAndSwitchChain, addChain, addPlugin, authenticateUser, switchChain, isConnecting, isInitializing, initError, connectError]);
+  }, [web3Auth, isConnected, isInitialized, provider, userInfo, isMFAEnabled, status, connectTo, getPlugin, enableMFA, manageMFA, logout, authenticateUser, switchChain, isConnecting, isInitializing, initError, connectError]);
   return react.createElement(Web3AuthInnerContext.Provider, {
     value
   }, children);

package/dist/lib.cjs/react/wallet-services-plugin/WalletServicesContext.js

@@ -2,6 +2,7 @@
 
 var react = require('react');
 var IPlugin = require('../../base/plugin/IPlugin.js');
+var constants = require('../../base/connector/constants.js');
 var errors = require('../../base/plugin/errors.js');
 
 const WalletServicesContext = react.createContext(null);
@@ -27,6 +28,8 @@ function WalletServicesContextProvider({
     if (isConnected) {
       const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
       if (!walletServicesPlugin) setWalletServicesPlugin(plugin);
+      // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
+      if ((walletServicesPlugin === null || walletServicesPlugin === void 0 ? void 0 : walletServicesPlugin.status) === constants.CONNECTOR_STATUS.CONNECTED) setIsPluginConnected(true);
     }
   }, [isConnected, getPlugin, walletServicesPlugin]);
   react.useEffect(() => {

package/dist/lib.cjs/vue/no-modal/Web3AuthProvider.js

@@ -4,7 +4,7 @@ var vue = require('vue');
 var index = require('../../base/composables/index.js');
 var index$1 = require('../../base/errors/index.js');
 var noModal = require('../../noModal.js');
-var constants = require('../../base/adapter/constants.js');
+var constants = require('../../base/connector/constants.js');
 
 const Web3AuthProvider = vue.defineComponent({
   name: "Web3AuthProvider",
@@ -26,10 +26,6 @@ const Web3AuthProvider = vue.defineComponent({
     const isConnecting = vue.ref(false);
     const connectError = vue.ref(null);
     const isConnected = vue.ref(false);
-    const addPlugin = plugin => {
-      if (!web3Auth.value) throw index$1.WalletInitializationError.notReady();
-      return web3Auth.value.addPlugin(plugin);
-    };
     const getPlugin = name => {
       if (!web3Auth.value) throw index$1.WalletInitializationError.notReady();
       return web3Auth.value.getPlugin(name);
@@ -67,21 +63,10 @@ const Web3AuthProvider = vue.defineComponent({
         isConnecting.value = false;
       }
     };
-    const addAndSwitchChain = async chainConfig => {
-      if (!web3Auth.value) throw index$1.WalletInitializationError.notReady();
-      await web3Auth.value.addChain(chainConfig);
-      await web3Auth.value.switchChain({
-        chainId: chainConfig.chainId
-      });
-    };
     const authenticateUser = async () => {
       if (!web3Auth.value) throw index$1.WalletInitializationError.notReady();
       return web3Auth.value.authenticateUser();
     };
-    const addChain = async chainConfig => {
-      if (!web3Auth.value) throw index$1.WalletInitializationError.notReady();
-      return web3Auth.value.addChain(chainConfig);
-    };
     const switchChain = chainParams => {
       if (!web3Auth.value) throw index$1.WalletInitializationError.notReady();
       return web3Auth.value.switchChain(chainParams);
@@ -96,17 +81,9 @@ const Web3AuthProvider = vue.defineComponent({
       };
       resetHookState();
       const {
-        web3AuthOptions,
-        adapters = [],
-        plugins = []
+        web3AuthOptions
       } = newConfig;
       const web3AuthInstance = new noModal.Web3AuthNoModal(web3AuthOptions);
-      if (adapters.length) adapters.map(adapter => web3AuthInstance.configureAdapter(adapter));
-      if (plugins.length) {
-        plugins.forEach(plugin => {
-          web3AuthInstance.addPlugin(plugin);
-        });
-      }
       web3Auth.value = web3AuthInstance;
     }, {
       immediate: true
@@ -151,7 +128,7 @@ const Web3AuthProvider = vue.defineComponent({
       const connectedListener = () => {
         status.value = web3Auth.value.status;
         // we do this because of rehydration issues. status connected is fired first but web3auth sdk is not ready yet.
-        if (web3Auth.value.status === constants.ADAPTER_STATUS.CONNECTED) {
+        if (web3Auth.value.status === constants.CONNECTOR_STATUS.CONNECTED) {
           isInitialized.value = true;
           isConnected.value = true;
         }
@@ -164,27 +141,27 @@ const Web3AuthProvider = vue.defineComponent({
         status.value = web3Auth.value.status;
       };
       const errorListener = () => {
-        status.value = constants.ADAPTER_EVENTS.ERRORED;
+        status.value = constants.CONNECTOR_EVENTS.ERRORED;
       };
 
       // unregister previous listeners
       if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
-        prevWeb3Auth.off(constants.ADAPTER_EVENTS.NOT_READY, notReadyListener);
-        prevWeb3Auth.off(constants.ADAPTER_EVENTS.READY, readyListener);
-        prevWeb3Auth.off(constants.ADAPTER_EVENTS.CONNECTED, connectedListener);
-        prevWeb3Auth.off(constants.ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-        prevWeb3Auth.off(constants.ADAPTER_EVENTS.CONNECTING, connectingListener);
-        prevWeb3Auth.off(constants.ADAPTER_EVENTS.ERRORED, errorListener);
+        prevWeb3Auth.off(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+        prevWeb3Auth.off(constants.CONNECTOR_EVENTS.READY, readyListener);
+        prevWeb3Auth.off(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        prevWeb3Auth.off(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+        prevWeb3Auth.off(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
+        prevWeb3Auth.off(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
       }
       if (newWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
         status.value = newWeb3Auth.status;
         // web3Auth is initialized here.
-        newWeb3Auth.on(constants.ADAPTER_EVENTS.NOT_READY, notReadyListener);
-        newWeb3Auth.on(constants.ADAPTER_EVENTS.READY, readyListener);
-        newWeb3Auth.on(constants.ADAPTER_EVENTS.CONNECTED, connectedListener);
-        newWeb3Auth.on(constants.ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-        newWeb3Auth.on(constants.ADAPTER_EVENTS.CONNECTING, connectingListener);
-        newWeb3Auth.on(constants.ADAPTER_EVENTS.ERRORED, errorListener);
+        newWeb3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+        newWeb3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
+        newWeb3Auth.on(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        newWeb3Auth.on(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+        newWeb3Auth.on(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
+        newWeb3Auth.on(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
       }
     }, {
       immediate: true
@@ -202,9 +179,6 @@ const Web3AuthProvider = vue.defineComponent({
       enableMFA,
       manageMFA,
       logout,
-      addAndSwitchChain,
-      addChain,
-      addPlugin,
       authenticateUser,
       switchChain,
       isInitializing,

package/dist/lib.cjs/vue/wallet-services-plugin/WalletServicesProvider.js

@@ -5,6 +5,7 @@ var index = require('../../base/composables/index.js');
 var context = require('./context.js');
 var errors = require('../../base/plugin/errors.js');
 var IPlugin = require('../../base/plugin/IPlugin.js');
+var constants = require('../../base/connector/constants.js');
 
 const WalletServicesProvider = vue.defineComponent({
   name: "WalletServicesProvider",
@@ -26,8 +27,11 @@ const WalletServicesProvider = vue.defineComponent({
     });
     vue.watch(isConnected, newIsConnected => {
       if (newIsConnected) {
+        var _walletServicesPlugin;
         const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
         if (!walletServicesPlugin.value) walletServicesPlugin.value = plugin;
+        // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
+        if (((_walletServicesPlugin = walletServicesPlugin.value) === null || _walletServicesPlugin === void 0 ? void 0 : _walletServicesPlugin.status) === constants.CONNECTOR_STATUS.CONNECTED) isPluginConnected.value = true;
       }
     });
     vue.watch(walletServicesPlugin, (newWalletServicesPlugin, prevWalletServicesPlugin) => {

package/dist/lib.esm/base/chain/IChainInterface.js

@@ -7,7 +7,7 @@ const CHAIN_NAMESPACES = {
 };
 // eip155 for all evm chains
 
-const ADAPTER_NAMESPACES = {
+const CONNECTOR_NAMESPACES = {
   EIP155: "eip155",
   SOLANA: "solana",
   CASPER: "casper",
@@ -16,4 +16,4 @@ const ADAPTER_NAMESPACES = {
 };
 // eip155 for all evm chains
 
-export { ADAPTER_NAMESPACES, CHAIN_NAMESPACES };
+export { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES };

package/dist/lib.esm/base/chain/config.js

@@ -1,6 +1,7 @@
 import { WalletInitializationError } from '../errors/index.js';
 import { CHAIN_NAMESPACES } from './IChainInterface.js';
 
+const INFURA_PROXY_URL = "https://api.web3auth.io/infura-service/v1";
 const getDefaultNetworkId = chainNamespace => {
   if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
     return 1;
@@ -13,14 +14,16 @@ const getDefaultNetworkId = chainNamespace => {
   }
   throw WalletInitializationError.invalidParams(`Chain namespace ${chainNamespace} is not supported`);
 };
-const getEvmChainConfig = chainId => {
+// TODO: remove this function and get this from dashboard instead
+const getEvmChainConfig = (chainId, web3AuthClientId = "") => {
   const chainNamespace = CHAIN_NAMESPACES.EIP155;
+  const infuraRpcTarget = `${INFURA_PROXY_URL}/${chainId}/${web3AuthClientId}`;
   if (chainId === 1) {
     return {
       logo: "https://images.toruswallet.io/eth.svg",
       chainNamespace,
       chainId: "0x1",
-      rpcTarget: `https://rpc.ankr.com/eth`,
+      rpcTarget: infuraRpcTarget,
       displayName: "Ethereum Mainnet",
       blockExplorerUrl: "https://etherscan.io/",
       ticker: "ETH",
@@ -28,17 +31,55 @@ const getEvmChainConfig = chainId => {
       decimals: 18
     };
   }
-  if (chainId === 5) {
+  if (chainId === 10) {
     return {
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      decimals: 18,
+      blockExplorerUrl: "https://optimistic.etherscan.io",
+      chainId: "0xa",
+      displayName: "Optimism",
+      logo: "optimism.svg",
+      rpcTarget: infuraRpcTarget,
+      ticker: "ETH",
+      tickerName: "Ethereum"
+    };
+  }
+  if (chainId === 8453) {
+    return {
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      decimals: 18,
+      blockExplorerUrl: "https://basescan.org",
+      chainId: "0x2105",
+      displayName: "Base",
+      logo: "base.svg",
+      rpcTarget: infuraRpcTarget,
+      ticker: "ETH",
+      tickerName: "Ethereum"
+    };
+  }
+  if (chainId === 42161) {
+    return {
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      decimals: 18,
+      blockExplorerUrl: "https://arbiscan.io",
+      chainId: "0xa4b1",
+      displayName: "Arbitrum One",
+      logo: "arbitrum.svg",
+      rpcTarget: infuraRpcTarget,
+      ticker: "ETH",
+      tickerName: "Ethereum"
+    };
+  }
+  if (chainId === 59144) {
+    return {
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      decimals: 18,
+      blockExplorerUrl: "https://lineascan.build",
+      chainId: "0xe708",
       logo: "https://images.toruswallet.io/eth.svg",
-      chainNamespace,
-      chainId: "0x5",
-      rpcTarget: `https://rpc.ankr.com/eth_goerli`,
-      displayName: "Goerli Testnet",
-      blockExplorerUrl: "https://goerli.etherscan.io/",
+      rpcTarget: infuraRpcTarget,
       ticker: "ETH",
-      tickerName: "Ethereum",
-      decimals: 18
+      tickerName: "Ethereum"
     };
   }
   if (chainId === 11155111) {
@@ -46,7 +87,7 @@ const getEvmChainConfig = chainId => {
       logo: "https://images.toruswallet.io/eth.svg",
       chainNamespace,
       chainId: "0xaa36a7",
-      rpcTarget: `https://rpc.ankr.com/eth_sepolia`,
+      rpcTarget: infuraRpcTarget,
       displayName: "Sepolia Testnet",
       blockExplorerUrl: "https://sepolia.etherscan.io/",
       ticker: "ETH",
@@ -59,7 +100,7 @@ const getEvmChainConfig = chainId => {
       logo: "https://images.toruswallet.io/polygon.svg",
       chainNamespace,
       chainId: "0x89",
-      rpcTarget: "https://rpc.ankr.com/polygon",
+      rpcTarget: infuraRpcTarget,
       displayName: "Polygon Mainnet",
       blockExplorerUrl: "https://polygonscan.com",
       ticker: "POL",
@@ -71,7 +112,7 @@ const getEvmChainConfig = chainId => {
       logo: "https://images.toruswallet.io/polygon.svg",
       chainNamespace,
       chainId: "0x13882",
-      rpcTarget: "https://rpc.ankr.com/polygon_amoy",
+      rpcTarget: infuraRpcTarget,
       displayName: "Polygon Amoy Testnet",
       blockExplorerUrl: "https://www.oklink.com/amoy",
       ticker: "POL",
@@ -84,7 +125,7 @@ const getEvmChainConfig = chainId => {
       logo: "https://images.toruswallet.io/bnb.png",
       chainNamespace,
       chainId: "0x38",
-      rpcTarget: "https://rpc.ankr.com/bsc",
+      rpcTarget: infuraRpcTarget,
       displayName: "Binance SmartChain Mainnet",
       blockExplorerUrl: "https://bscscan.com",
       ticker: "BNB",
@@ -97,7 +138,7 @@ const getEvmChainConfig = chainId => {
       logo: "https://images.toruswallet.io/bnb.png",
       chainNamespace,
       chainId: "0x61",
-      rpcTarget: "https://rpc.ankr.com/bsc_testnet_chapel",
+      rpcTarget: infuraRpcTarget,
       displayName: "Binance SmartChain Testnet",
       blockExplorerUrl: "https://testnet.bscscan.com",
       ticker: "BNB",
@@ -171,7 +212,8 @@ const getEvmChainConfig = chainId => {
 };
 const getSolanaChainConfig = chainId => {
   const chainNamespace = CHAIN_NAMESPACES.SOLANA;
-  if (chainId === 101) {
+  // support both cross chain id and base solana chain id from 1
+  if (chainId === 101 || chainId === 1) {
     return {
       logo: "https://images.toruswallet.io/sol.svg",
       chainNamespace,
@@ -183,7 +225,7 @@ const getSolanaChainConfig = chainId => {
       tickerName: "Solana",
       decimals: 9
     };
-  } else if (chainId === 102) {
+  } else if (chainId === 102 || chainId === 2) {
     return {
       logo: "https://images.toruswallet.io/sol.svg",
       chainNamespace,
@@ -195,7 +237,7 @@ const getSolanaChainConfig = chainId => {
       tickerName: "Solana",
       decimals: 9
     };
-  } else if (chainId === 103) {
+  } else if (chainId === 103 || chainId === 3) {
     return {
       logo: "https://images.toruswallet.io/sol.svg",
       chainNamespace,
@@ -258,13 +300,12 @@ const getXrplChainConfig = chainId => {
   }
   return null;
 };
-const getChainConfig = (chainNamespace, chainId) => {
+const getChainConfig = (chainNamespace, chainId, web3AuthClientId) => {
   if (chainNamespace === CHAIN_NAMESPACES.OTHER) return null;
   const finalChainId = chainId ? typeof chainId === "number" ? chainId : parseInt(chainId, 16) : getDefaultNetworkId(chainNamespace);
   if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
-    return getEvmChainConfig(finalChainId);
-  }
-  if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+    return getEvmChainConfig(finalChainId, web3AuthClientId);
+  } else if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
     return getSolanaChainConfig(finalChainId);
   }
   if (chainNamespace === CHAIN_NAMESPACES.XRPL) {

package/dist/lib.esm/base/connector/baseConnector.js

@@ -0,0 +1,65 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { SafeEventEmitter } from '@web3auth/auth';
+import { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES } from '../chain/IChainInterface.js';
+import { WalletInitializationError, WalletLoginError } from '../errors/index.js';
+import { WALLET_CONNECTORS } from '../wallet/index.js';
+import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from './constants.js';
+
+class BaseConnector extends SafeEventEmitter {
+  constructor(options) {
+    super();
+    _defineProperty(this, "connectorData", {});
+    _defineProperty(this, "isInjected", void 0);
+    _defineProperty(this, "coreOptions", void 0);
+    _defineProperty(this, "rehydrated", false);
+    _defineProperty(this, "connectorNamespace", void 0);
+    _defineProperty(this, "type", void 0);
+    _defineProperty(this, "name", void 0);
+    _defineProperty(this, "status", void 0);
+    this.coreOptions = options.coreOptions;
+  }
+  get connnected() {
+    return this.status === CONNECTOR_STATUS.CONNECTED;
+  }
+  checkConnectionRequirements() {
+    // we reconnect without killing existing wallet connect session on calling connect again.
+    if (this.name === WALLET_CONNECTORS.WALLET_CONNECT_V2 && this.status === CONNECTOR_STATUS.CONNECTING) return;
+    if (this.status === CONNECTOR_STATUS.CONNECTING) throw WalletInitializationError.notReady("Already connecting");
+    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.connectionError("Already connected");
+    if (this.status !== CONNECTOR_STATUS.READY) throw WalletLoginError.connectionError("Wallet connector is not ready yet, Please wait for init function to resolve before calling connect/connectTo function");
+  }
+  checkInitializationRequirements({
+    chainConfig
+  }) {
+    if (!this.coreOptions.clientId) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid clientId in constructor");
+    if (!chainConfig) throw WalletInitializationError.invalidParams("chainConfig is required before initialization");
+    if (!chainConfig.rpcTarget && chainConfig.chainNamespace !== CHAIN_NAMESPACES.OTHER) {
+      throw WalletInitializationError.invalidParams("rpcTarget is required in chainConfig");
+    }
+    if (!chainConfig.chainId && chainConfig.chainNamespace !== CHAIN_NAMESPACES.OTHER) {
+      throw WalletInitializationError.invalidParams("chainID is required in chainConfig");
+    }
+    if (this.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN && this.connectorNamespace !== chainConfig.chainNamespace) throw WalletInitializationError.invalidParams("Connector doesn't support this chain namespace");
+    if (this.status === CONNECTOR_STATUS.NOT_READY) return;
+    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletInitializationError.notReady("Already connected");
+    if (this.status === CONNECTOR_STATUS.READY) throw WalletInitializationError.notReady("Connector is already initialized");
+  }
+  checkDisconnectionRequirements() {
+    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.disconnectionError("Not connected with wallet");
+  }
+  checkSwitchChainRequirements(params, init = false) {
+    if (!init && !this.provider) throw WalletLoginError.notConnectedError("Not connected with wallet.");
+    if (!this.coreOptions.chains) throw WalletInitializationError.invalidParams("chainConfigs is required");
+    const doesChainExist = this.coreOptions.chains.some(x => x.chainId === params.chainId && (x.chainNamespace === this.connectorNamespace || this.connectorNamespace === CONNECTOR_NAMESPACES.MULTICHAIN));
+    if (!doesChainExist) throw WalletInitializationError.invalidParams("Invalid chainId");
+  }
+  updateConnectorData(data) {
+    this.connectorData = data;
+    this.emit(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, {
+      connectorName: this.name,
+      data
+    });
+  }
+}
+
+export { BaseConnector };

package/dist/lib.esm/base/connector/constants.js

@@ -0,0 +1,22 @@
+import _objectSpread from '@babel/runtime/helpers/objectSpread2';
+
+const CONNECTOR_STATUS = {
+  NOT_READY: "not_ready",
+  READY: "ready",
+  CONNECTING: "connecting",
+  CONNECTED: "connected",
+  DISCONNECTING: "disconnecting",
+  DISCONNECTED: "disconnected",
+  ERRORED: "errored"
+};
+const CONNECTOR_EVENTS = _objectSpread(_objectSpread({}, CONNECTOR_STATUS), {}, {
+  CONNECTOR_DATA_UPDATED: "connector_data_updated",
+  CACHE_CLEAR: "cache_clear",
+  CONNECTORS_UPDATED: "connectors_updated"
+});
+const CONNECTOR_CATEGORY = {
+  EXTERNAL: "external",
+  IN_APP: "in_app"
+};
+
+export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS };

package/dist/lib.esm/base/errors/index.js

@@ -81,7 +81,7 @@ class WalletInitializationError extends Web3AuthError {
   static incompatibleChainNameSpace(extraMessage = "", cause) {
     return WalletInitializationError.fromCode(5006, extraMessage, cause);
   }
-  static duplicateAdapterError(extraMessage = "", cause) {
+  static duplicateConnectorError(extraMessage = "", cause) {
     return WalletInitializationError.fromCode(5007, extraMessage, cause);
   }
   static invalidProviderConfigError(extraMessage = "", cause) {
@@ -112,7 +112,7 @@ _defineProperty(WalletInitializationError, "messages", {
   5004: "Wallet window is blocked",
   5005: "Wallet window has been closed by the user",
   5006: "Incompatible chain namespace provided",
-  5007: "Adapter has already been included",
+  5007: "Connector has already been included",
   5008: "Invalid provider Config",
   5009: "Provider is not ready yet",
   5010: "Failed to connect with rpc url",

package/dist/lib.esm/base/plugin/errors.js

@@ -17,7 +17,7 @@ class WalletServicesPluginError extends Web3AuthError {
   static notInitialized(extraMessage = "", cause) {
     return WalletServicesPluginError.fromCode(5210, extraMessage, cause);
   }
-  static unsupportedAdapter(extraMessage = "", cause) {
+  static unsupportedConnector(extraMessage = "", cause) {
     return WalletServicesPluginError.fromCode(5211, extraMessage, cause);
   }
   static providerRequired(extraMessage = "", cause) {
@@ -53,7 +53,7 @@ class WalletServicesPluginError extends Web3AuthError {
 }
 _defineProperty(WalletServicesPluginError, "messages", {
   5210: "Wallet Services Plugin is not initialized",
-  5211: "Web3Auth is connected to unsupported adapter. Wallet services connector plugin requires web3auth connected to auth adapter.",
+  5211: "Web3Auth is connected to unsupported connector. Wallet services connector plugin requires web3auth connected to auth connector.",
   5212: "Provider is required..",
   5213: "Web3Auth instance is required while initialization.",
   5214: "Web3Auth is not connected.",

package/dist/lib.esm/base/wallet/index.js

@@ -1,25 +1,20 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 
-const MULTI_CHAIN_ADAPTERS = {
+const MULTI_CHAIN_CONNECTORS = {
   AUTH: "auth",
   WALLET_CONNECT_V2: "wallet-connect-v2",
   SFA: "sfa"
 };
-const SOLANA_ADAPTERS = _objectSpread({
-  TORUS_SOLANA: "torus-solana"
-}, MULTI_CHAIN_ADAPTERS);
-const EVM_ADAPTERS = _objectSpread({
-  TORUS_EVM: "torus-evm",
+const SOLANA_CONNECTORS = _objectSpread({}, MULTI_CHAIN_CONNECTORS);
+const EVM_CONNECTORS = _objectSpread({
   COINBASE: "coinbase"
-}, MULTI_CHAIN_ADAPTERS);
-const WALLET_ADAPTERS = _objectSpread(_objectSpread({}, EVM_ADAPTERS), SOLANA_ADAPTERS);
-const ADAPTER_NAMES = {
-  [MULTI_CHAIN_ADAPTERS.AUTH]: "Auth",
-  [MULTI_CHAIN_ADAPTERS.WALLET_CONNECT_V2]: "Wallet Connect v2",
-  [MULTI_CHAIN_ADAPTERS.SFA]: "SFA",
-  [SOLANA_ADAPTERS.TORUS_SOLANA]: "Torus",
-  [EVM_ADAPTERS.TORUS_EVM]: "Torus",
-  [EVM_ADAPTERS.COINBASE]: "Coinbase Smart Wallet"
+}, MULTI_CHAIN_CONNECTORS);
+const WALLET_CONNECTORS = _objectSpread(_objectSpread({}, EVM_CONNECTORS), SOLANA_CONNECTORS);
+const CONNECTOR_NAMES = {
+  [MULTI_CHAIN_CONNECTORS.AUTH]: "Auth",
+  [MULTI_CHAIN_CONNECTORS.WALLET_CONNECT_V2]: "Wallet Connect v2",
+  [MULTI_CHAIN_CONNECTORS.SFA]: "SFA",
+  [EVM_CONNECTORS.COINBASE]: "Coinbase Smart Wallet"
 };
 
-export { ADAPTER_NAMES, EVM_ADAPTERS, MULTI_CHAIN_ADAPTERS, SOLANA_ADAPTERS, WALLET_ADAPTERS };
+export { CONNECTOR_NAMES, EVM_CONNECTORS, MULTI_CHAIN_CONNECTORS, SOLANA_CONNECTORS, WALLET_CONNECTORS };