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

package/dist/lib.cjs/connectors/metamask-connector/metamaskConnector.js

@@ -0,0 +1,197 @@
+'use strict';
+
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var sdk = require('@metamask/sdk');
+var deepmerge = require('deepmerge');
+var index$1 = require('../../base/errors/index.js');
+var IChainInterface = require('../../base/chain/IChainInterface.js');
+require('@web3auth/auth');
+var index = require('../../base/wallet/index.js');
+var constants = require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/loglevel.js');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var baseEvmConnector = require('../base-evm-connector/baseEvmConnector.js');
+var utils = require('../utils.js');
+
+class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
+  constructor(connectorOptions) {
+    super(connectorOptions);
+    _defineProperty(this, "connectorNamespace", IChainInterface.CONNECTOR_NAMESPACES.EIP155);
+    _defineProperty(this, "currentChainNamespace", baseControllers.CHAIN_NAMESPACES.EIP155);
+    _defineProperty(this, "type", constants.CONNECTOR_CATEGORY.EXTERNAL);
+    _defineProperty(this, "name", index.WALLET_CONNECTORS.METAMASK);
+    _defineProperty(this, "status", constants.CONNECTOR_STATUS.NOT_READY);
+    _defineProperty(this, "metamaskProvider", null);
+    _defineProperty(this, "metamaskSDK", null);
+    _defineProperty(this, "metamaskOptions", void 0);
+    this.metamaskOptions = connectorOptions.connectorSettings;
+  }
+  get provider() {
+    if (this.status !== constants.CONNECTOR_STATUS.NOT_READY && this.metamaskProvider) {
+      return this.metamaskProvider;
+    }
+    return null;
+  }
+  set provider(_) {
+    throw new Error("Not implemented");
+  }
+  async init(options) {
+    await super.init(options);
+    const chainConfig = this.coreOptions.chains.find(x => x.chainId === options.chainId);
+    super.checkInitializationRequirements({
+      chainConfig
+    });
+    // Detect app metadata
+    const iconUrl = await utils.getSiteIcon(window);
+    const appMetadata = {
+      name: utils.getSiteName(window),
+      url: window.location.origin,
+      iconUrl
+    };
+    // Initialize the MetaMask SDK
+    const metamaskOptions = deepmerge(this.metamaskOptions || {}, {
+      dappMetadata: appMetadata
+    });
+    this.metamaskSDK = new sdk.MetaMaskSDK(metamaskOptions);
+    this.status = constants.CONNECTOR_STATUS.READY;
+    this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.METAMASK);
+    try {
+      if (options.autoConnect) {
+        this.rehydrated = true;
+        await this.connect({
+          chainId: options.chainId
+        });
+      }
+    } catch (error) {
+      this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
+    }
+  }
+  async connect({
+    chainId
+  }) {
+    super.checkConnectionRequirements();
+    if (!this.metamaskSDK) throw index$1.WalletLoginError.notConnectedError("Connector is not initialized");
+    const chainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
+    if (!chainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
+    this.status = constants.CONNECTOR_STATUS.CONNECTING;
+    this.emit(constants.CONNECTOR_EVENTS.CONNECTING, {
+      connector: index.WALLET_CONNECTORS.METAMASK
+    });
+    try {
+      await this.metamaskSDK.connect();
+      this.metamaskProvider = this.metamaskSDK.getProvider();
+      if (!this.metamaskProvider) throw index$1.WalletLoginError.notConnectedError("Failed to connect with provider");
+      // switch chain if not connected to the right chain
+      const currentChainId = await this.metamaskProvider.request({
+        method: "eth_chainId"
+      });
+      if (currentChainId !== chainConfig.chainId) {
+        await this.switchChain(chainConfig, true);
+      }
+      // handle disconnect event
+      const accountDisconnectHandler = accounts => {
+        if (accounts.length === 0) this.disconnect();
+      };
+      this.metamaskProvider.on("accountsChanged", accountDisconnectHandler);
+      this.metamaskProvider.once("disconnect", () => {
+        this.disconnect();
+      });
+      this.status = constants.CONNECTOR_STATUS.CONNECTED;
+      this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
+        connector: index.WALLET_CONNECTORS.METAMASK,
+        reconnected: this.rehydrated,
+        provider: this.metamaskProvider
+      });
+      return this.metamaskProvider;
+    } catch (error) {
+      // ready again to be connected
+      this.status = constants.CONNECTOR_STATUS.READY;
+      this.rehydrated = false;
+      this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
+      if (error instanceof index$1.Web3AuthError) throw error;
+      throw index$1.WalletLoginError.connectionError("Failed to login with MetaMask wallet", error);
+    }
+  }
+  async disconnect(options = {
+    cleanup: false
+  }) {
+    if (!this.metamaskProvider) throw index$1.WalletLoginError.connectionError("MetaMask provider is not available");
+    await super.disconnectSession();
+    if (typeof this.metamaskProvider.removeAllListeners !== "undefined") this.metamaskProvider.removeAllListeners();
+    await this.metamaskSDK.terminate();
+    if (options.cleanup) {
+      this.status = constants.CONNECTOR_STATUS.NOT_READY;
+      this.metamaskProvider = null;
+    } else {
+      // ready to be connected again
+      this.status = constants.CONNECTOR_STATUS.READY;
+    }
+    await super.disconnect();
+  }
+  async getUserInfo() {
+    if (this.status !== constants.CONNECTOR_STATUS.CONNECTED) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    return {};
+  }
+  async switchChain(params, init = false) {
+    super.checkSwitchChainRequirements(params, init);
+    const requestSwitchChain = () => this.metamaskProvider.request({
+      method: "wallet_switchEthereumChain",
+      params: [{
+        chainId: params.chainId
+      }]
+    });
+    try {
+      await requestSwitchChain();
+    } catch (error) {
+      // If the error code is 4902, the network needs to be added
+      if ((error === null || error === void 0 ? void 0 : error.code) === 4902) {
+        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && x.chainNamespace === this.connectorNamespace);
+        await this.addChain(chainConfig);
+        await requestSwitchChain();
+      } else {
+        throw error;
+      }
+    }
+  }
+  async enableMFA() {
+    throw new Error("Method Not implemented");
+  }
+  async manageMFA() {
+    throw new Error("Method Not implemented");
+  }
+  async addChain(chainConfig) {
+    if (!this.metamaskProvider) throw index$1.WalletLoginError.connectionError("Injected provider is not available");
+    await this.metamaskProvider.request({
+      method: "wallet_addEthereumChain",
+      params: [{
+        chainId: chainConfig.chainId,
+        chainName: chainConfig.displayName,
+        rpcUrls: [chainConfig.rpcTarget],
+        blockExplorerUrls: [chainConfig.blockExplorerUrl],
+        nativeCurrency: {
+          name: chainConfig.tickerName,
+          symbol: chainConfig.ticker,
+          decimals: chainConfig.decimals || 18
+        },
+        iconUrls: [chainConfig.logo]
+      }]
+    });
+  }
+}
+const metaMaskConnector = params => {
+  return ({
+    coreOptions
+  }) => {
+    return new MetaMaskConnector({
+      connectorSettings: params,
+      coreOptions
+    });
+  };
+};
+
+exports.metaMaskConnector = metaMaskConnector;

package/dist/lib.cjs/connectors/utils.js

@@ -0,0 +1,61 @@
+'use strict';
+
+/**
+ * Extracts a name for the site from the DOM
+ */
+const getSiteName = window => {
+  const {
+    document
+  } = window;
+  const siteName = document.querySelector('head > meta[property="og:site_name"]');
+  if (siteName) {
+    return siteName.content;
+  }
+  const metaTitle = document.querySelector('head > meta[name="title"]');
+  if (metaTitle) {
+    return metaTitle.content;
+  }
+  if (document.title && document.title.length > 0) {
+    return document.title;
+  }
+  return window.location.hostname;
+};
+/**
+ * Returns whether the given image URL exists
+ * @param url - the url of the image
+ * @returns - whether the image exists
+ */
+function imgExists(url) {
+  return new Promise((resolve, reject) => {
+    try {
+      const img = document.createElement("img");
+      img.onload = () => resolve(true);
+      img.onerror = () => resolve(false);
+      img.src = url;
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+/**
+ * Extracts an icon for the site from the DOM
+ */
+async function getSiteIcon(window) {
+  const {
+    document
+  } = window;
+  // Use the site's favicon if it exists
+  let icon = document.querySelector('head > link[rel="shortcut icon"]');
+  if (icon && (await imgExists(icon.href))) {
+    return icon.href;
+  }
+  // Search through available icons in no particular order
+  icon = Array.from(document.querySelectorAll('head > link[rel="icon"]')).find(_icon => Boolean(_icon.href)) || null;
+  if (icon && (await imgExists(icon.href))) {
+    return icon.href;
+  }
+  return null;
+}
+
+exports.getSiteIcon = getSiteIcon;
+exports.getSiteName = getSiteName;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js

@@ -4,15 +4,34 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var utils = require('@walletconnect/utils');
 var auth = require('@web3auth/auth');
-var IChainInterface = require('../../base/chain/IChainInterface.js');
 var index = require('../../base/errors/index.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('../../base/wallet/index.js');
+require('../../base/connector/constants.js');
+require('jwt-decode');
 var loglevel = require('../../base/loglevel.js');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
 var baseProvider = require('../../providers/base-provider/baseProvider.js');
-var walletConnectV2Utils = require('./walletConnectV2Utils.js');
+require('../../providers/base-provider/CommonJRPCProvider.js');
+require('../../providers/base-provider/commonPrivateKeyProvider.js');
+require('../../providers/base-provider/utils.js');
+require('@ethereumjs/util');
+require('bignumber.js');
+require('../../providers/ethereum-provider/providers/converter.js');
+require('bn.js');
+require('../../providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js');
 var ethRpcMiddlewares = require('../../providers/ethereum-provider/rpc/ethRpcMiddlewares.js');
 var jrpcClient = require('../../providers/ethereum-provider/rpc/jrpcClient.js');
-var solanaRpcMiddlewares = require('../../providers/solana-provider/rpc/solanaRpcMiddlewares.js');
+require('@solana/wallet-standard-features');
+require('@solana/web3.js');
+require('@toruslabs/bs58');
 var JrpcClient = require('../../providers/solana-provider/rpc/JrpcClient.js');
+var solanaRpcMiddlewares = require('../../providers/solana-provider/rpc/solanaRpcMiddlewares.js');
+require('@web3auth/ws-embed');
+var walletConnectV2Utils = require('./walletConnectV2Utils.js');
 
 var _WalletConnectV2Provider;
 class WalletConnectV2Provider extends baseProvider.BaseProvider {
@@ -72,16 +91,15 @@ class WalletConnectV2Provider extends baseProvider.BaseProvider {
       chainId
     });
   }
-
   // no need to implement this method in wallet connect v2.
   async lookupNetwork(_, chainId) {
     return chainId;
   }
   async setupEngine(connector, chainId) {
     const chain = this.getChain(chainId);
-    if (chain.chainNamespace === IChainInterface.CHAIN_NAMESPACES.EIP155) {
+    if (chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
       await this.setupEthEngine(connector, chainId);
-    } else if (chain.chainNamespace === IChainInterface.CHAIN_NAMESPACES.SOLANA) {
+    } else if (chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
       await this.setupSolEngine(connector, chainId);
     } else {
       throw new Error(`Unsupported chainNamespace: ${chain.chainNamespace}`);
@@ -199,7 +217,6 @@ class WalletConnectV2Provider extends baseProvider.BaseProvider {
         if (!data) return;
         const connectedChainId = data;
         const connectedHexChainId = `0x${connectedChainId.toString(16)}`;
-
         // Check if chainId changed and trigger event
         const {
           currentChain

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/config.js

@@ -1,8 +1,21 @@
 'use strict';
 
-var IChainInterface = require('../../base/chain/IChainInterface.js');
+require('../../base/errors/index.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('@babel/runtime/helpers/defineProperty');
+require('@web3auth/auth');
+require('../../base/wallet/index.js');
+require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/loglevel.js');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var utils = require('../utils.js');
 
-let DEFAULT_EIP155_METHODS = /*#__PURE__*/function (DEFAULT_EIP155_METHODS) {
+exports.DEFAULT_EIP155_METHODS = void 0;
+(function (DEFAULT_EIP155_METHODS) {
   DEFAULT_EIP155_METHODS["ETH_SEND_TRANSACTION"] = "eth_sendTransaction";
   DEFAULT_EIP155_METHODS["ETH_SIGN_TRANSACTION"] = "eth_signTransaction";
   DEFAULT_EIP155_METHODS["ETH_SIGN"] = "eth_sign";
@@ -12,97 +25,34 @@ let DEFAULT_EIP155_METHODS = /*#__PURE__*/function (DEFAULT_EIP155_METHODS) {
   DEFAULT_EIP155_METHODS["ETH_SIGN_TYPED_DATA_V4"] = "eth_signTypedData_v4";
   DEFAULT_EIP155_METHODS["ADD_ETHEREUM_CHAIN"] = "wallet_addEthereumChain";
   DEFAULT_EIP155_METHODS["SWITCH_ETHEREUM_CHAIN"] = "wallet_switchEthereumChain";
-  return DEFAULT_EIP155_METHODS;
-}({});
-let DEFAULT_SOLANA_METHODS = /*#__PURE__*/function (DEFAULT_SOLANA_METHODS) {
+})(exports.DEFAULT_EIP155_METHODS || (exports.DEFAULT_EIP155_METHODS = {}));
+exports.DEFAULT_SOLANA_METHODS = void 0;
+(function (DEFAULT_SOLANA_METHODS) {
   DEFAULT_SOLANA_METHODS["SIGN_TRANSACTION"] = "solana_signTransaction";
   DEFAULT_SOLANA_METHODS["SIGN_MESSAGE"] = "solana_signMessage";
-  return DEFAULT_SOLANA_METHODS;
-}({});
-let DEFAULT_EIP_155_EVENTS = /*#__PURE__*/function (DEFAULT_EIP_155_EVENTS) {
+})(exports.DEFAULT_SOLANA_METHODS || (exports.DEFAULT_SOLANA_METHODS = {}));
+exports.DEFAULT_EIP_155_EVENTS = void 0;
+(function (DEFAULT_EIP_155_EVENTS) {
   DEFAULT_EIP_155_EVENTS["ETH_CHAIN_CHANGED"] = "chainChanged";
   DEFAULT_EIP_155_EVENTS["ETH_ACCOUNTS_CHANGED"] = "accountsChanged";
-  return DEFAULT_EIP_155_EVENTS;
-}({});
-let DEFAULT_SOLANA_EVENTS = /*#__PURE__*/function (DEFAULT_SOLANA_EVENTS) {
+})(exports.DEFAULT_EIP_155_EVENTS || (exports.DEFAULT_EIP_155_EVENTS = {}));
+exports.DEFAULT_SOLANA_EVENTS = void 0;
+(function (DEFAULT_SOLANA_EVENTS) {
   DEFAULT_SOLANA_EVENTS["SOL_CHAIN_CHANGED"] = "chainChanged";
   DEFAULT_SOLANA_EVENTS["SOL_ACCOUNTS_CHANGED"] = "accountsChanged";
-  return DEFAULT_SOLANA_EVENTS;
-}({});
+})(exports.DEFAULT_SOLANA_EVENTS || (exports.DEFAULT_SOLANA_EVENTS = {}));
 const SOLANA_CAIP_CHAIN_MAP = {
   "0x65": "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
   "0x66": "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z",
   "0x67": "EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
 };
-
-/**
- * Extracts a name for the site from the DOM
- */
-const getSiteName = window => {
-  const {
-    document
-  } = window;
-  const siteName = document.querySelector('head > meta[property="og:site_name"]');
-  if (siteName) {
-    return siteName.content;
-  }
-  const metaTitle = document.querySelector('head > meta[name="title"]');
-  if (metaTitle) {
-    return metaTitle.content;
-  }
-  if (document.title && document.title.length > 0) {
-    return document.title;
-  }
-  return window.location.hostname;
-};
-
-/**
- * Returns whether the given image URL exists
- * @param url - the url of the image
- * @returns - whether the image exists
- */
-function imgExists(url) {
-  return new Promise((resolve, reject) => {
-    try {
-      const img = document.createElement("img");
-      img.onload = () => resolve(true);
-      img.onerror = () => resolve(false);
-      img.src = url;
-    } catch (e) {
-      reject(e);
-    }
-  });
-}
-
-/**
- * Extracts an icon for the site from the DOM
- */
-async function getSiteIcon(window) {
-  const {
-    document
-  } = window;
-
-  // Use the site's favicon if it exists
-  let icon = document.querySelector('head > link[rel="shortcut icon"]');
-  if (icon && (await imgExists(icon.href))) {
-    return icon.href;
-  }
-
-  // Search through available icons in no particular order
-  icon = Array.from(document.querySelectorAll('head > link[rel="icon"]')).find(_icon => Boolean(_icon.href)) || null;
-  if (icon && (await imgExists(icon.href))) {
-    return icon.href;
-  }
-  return null;
-}
-
 /**
  * Gets site metadata and returns it
  *
  */
 const getSiteMetadata = async () => ({
-  name: getSiteName(window),
-  icon: await getSiteIcon(window)
+  name: utils.getSiteName(window),
+  icon: await utils.getSiteIcon(window)
 });
 const getNamespacesFromChains = chains => {
   const supportedNamespaces = [];
@@ -116,20 +66,20 @@ const getNamespacesFromChains = chains => {
 };
 const getSupportedMethodsByNamespace = namespace => {
   switch (namespace) {
-    case IChainInterface.CHAIN_NAMESPACES.EIP155:
-      return Object.values(DEFAULT_EIP155_METHODS);
-    case IChainInterface.CHAIN_NAMESPACES.SOLANA:
-      return Object.values(DEFAULT_SOLANA_METHODS);
+    case baseControllers.CHAIN_NAMESPACES.EIP155:
+      return Object.values(exports.DEFAULT_EIP155_METHODS);
+    case baseControllers.CHAIN_NAMESPACES.SOLANA:
+      return Object.values(exports.DEFAULT_SOLANA_METHODS);
     default:
       throw new Error(`No default methods for namespace: ${namespace}`);
   }
 };
 const getSupportedEventsByNamespace = namespace => {
   switch (namespace) {
-    case IChainInterface.CHAIN_NAMESPACES.EIP155:
-      return Object.values(DEFAULT_EIP_155_EVENTS);
-    case IChainInterface.CHAIN_NAMESPACES.SOLANA:
-      return Object.values(DEFAULT_SOLANA_EVENTS);
+    case baseControllers.CHAIN_NAMESPACES.EIP155:
+      return Object.values(exports.DEFAULT_EIP_155_EVENTS);
+    case baseControllers.CHAIN_NAMESPACES.SOLANA:
+      return Object.values(exports.DEFAULT_SOLANA_EVENTS);
     default:
       throw new Error(`No default events for namespace: ${namespace}`);
   }
@@ -157,7 +107,7 @@ const getWalletConnectV2Settings = async (chains, projectID) => {
     }
   };
   const chainNamespaces = chains.map(chain => {
-    return `${chain.chainNamespace}:${chain.chainNamespace === IChainInterface.CHAIN_NAMESPACES.SOLANA ? SOLANA_CAIP_CHAIN_MAP[chain.chainId] : parseInt(chain.chainId, 16)}`;
+    return `${chain.chainNamespace}:${chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA ? SOLANA_CAIP_CHAIN_MAP[chain.chainId] : parseInt(chain.chainId, 16)}`;
   });
   const loginSettings = {
     optionalNamespaces: getRequiredNamespaces(chainNamespaces)
@@ -168,10 +118,6 @@ const getWalletConnectV2Settings = async (chains, projectID) => {
   };
 };
 
-exports.DEFAULT_EIP155_METHODS = DEFAULT_EIP155_METHODS;
-exports.DEFAULT_EIP_155_EVENTS = DEFAULT_EIP_155_EVENTS;
-exports.DEFAULT_SOLANA_EVENTS = DEFAULT_SOLANA_EVENTS;
-exports.DEFAULT_SOLANA_METHODS = DEFAULT_SOLANA_METHODS;
 exports.SOLANA_CAIP_CHAIN_MAP = SOLANA_CAIP_CHAIN_MAP;
 exports.getNamespacesFromChains = getNamespacesFromChains;
 exports.getRequiredNamespaces = getRequiredNamespaces;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/index.js

@@ -6,10 +6,22 @@ var WalletConnectV2Provider = require('./WalletConnectV2Provider.js');
 
 
 
-exports.DEFAULT_EIP155_METHODS = config.DEFAULT_EIP155_METHODS;
-exports.DEFAULT_EIP_155_EVENTS = config.DEFAULT_EIP_155_EVENTS;
-exports.DEFAULT_SOLANA_EVENTS = config.DEFAULT_SOLANA_EVENTS;
-exports.DEFAULT_SOLANA_METHODS = config.DEFAULT_SOLANA_METHODS;
+Object.defineProperty(exports, "DEFAULT_EIP155_METHODS", {
+	enumerable: true,
+	get: function () { return config.DEFAULT_EIP155_METHODS; }
+});
+Object.defineProperty(exports, "DEFAULT_EIP_155_EVENTS", {
+	enumerable: true,
+	get: function () { return config.DEFAULT_EIP_155_EVENTS; }
+});
+Object.defineProperty(exports, "DEFAULT_SOLANA_EVENTS", {
+	enumerable: true,
+	get: function () { return config.DEFAULT_SOLANA_EVENTS; }
+});
+Object.defineProperty(exports, "DEFAULT_SOLANA_METHODS", {
+	enumerable: true,
+	get: function () { return config.DEFAULT_SOLANA_METHODS; }
+});
 exports.SOLANA_CAIP_CHAIN_MAP = config.SOLANA_CAIP_CHAIN_MAP;
 exports.getNamespacesFromChains = config.getNamespacesFromChains;
 exports.getRequiredNamespaces = config.getRequiredNamespaces;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -7,15 +7,20 @@ var Client = require('@walletconnect/sign-client');
 var utils$1 = require('@walletconnect/utils');
 var wsEmbed = require('@web3auth/ws-embed');
 var deepmerge = require('deepmerge');
-var IChainInterface = require('../../base/chain/IChainInterface.js');
 var index$1 = require('../../base/errors/index.js');
+var IChainInterface = require('../../base/chain/IChainInterface.js');
+var baseConnector = require('../../base/connector/baseConnector.js');
+var constants = require('../../base/connector/constants.js');
+require('@web3auth/auth');
+var utils = require('../../base/connector/utils.js');
 var loglevel = require('../../base/loglevel.js');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
 var index = require('../../base/wallet/index.js');
 var config = require('./config.js');
 var WalletConnectV2Provider = require('./WalletConnectV2Provider.js');
-var baseConnector = require('../../base/connector/baseConnector.js');
-var constants = require('../../base/connector/constants.js');
-var utils = require('../../base/connector/utils.js');
 
 class WalletConnectV2Connector extends baseConnector.BaseConnector {
   constructor(options) {
@@ -23,7 +28,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     super(options);
     _defineProperty(this, "name", index.WALLET_CONNECTORS.WALLET_CONNECT_V2);
     _defineProperty(this, "connectorNamespace", IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN);
-    _defineProperty(this, "currentChainNamespace", IChainInterface.CHAIN_NAMESPACES.OTHER);
+    _defineProperty(this, "currentChainNamespace", baseControllers.CHAIN_NAMESPACES.OTHER);
     _defineProperty(this, "type", constants.CONNECTOR_CATEGORY.EXTERNAL);
     _defineProperty(this, "connectorOptions", void 0);
     _defineProperty(this, "status", constants.CONNECTOR_STATUS.NOT_READY);
@@ -68,9 +73,6 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       chainConfig
     });
     const projectId = (_this$connectorOption6 = this.connectorOptions.connectorSettings) === null || _this$connectorOption6 === void 0 || (_this$connectorOption6 = _this$connectorOption6.walletConnectInitOptions) === null || _this$connectorOption6 === void 0 ? void 0 : _this$connectorOption6.projectId;
-    if (!projectId) {
-      throw index$1.WalletInitializationError.invalidParams("Wallet connect project id is required in wallet connect v2 connector");
-    }
     const wc2Settings = await config.getWalletConnectV2Settings(this.coreOptions.chains, projectId);
     if (!this.connectorOptions.loginSettings || Object.keys(this.connectorOptions.loginSettings).length === 0) {
       this.connectorOptions.loginSettings = wc2Settings.loginSettings;
@@ -191,7 +193,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       chainNamespace
     } = currentChainConfig;
     const accounts = await this.provider.request({
-      method: chainNamespace === IChainInterface.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS : wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
+      method: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS : wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
     });
     if (accounts && accounts.length > 0) {
       const existingToken = utils.getSavedToken(accounts[0], this.name);
@@ -283,7 +285,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
             this.status = constants.CONNECTOR_STATUS.READY;
             this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.WALLET_CONNECT_V2);
           } catch (error) {
-            loglevel.log.error("unable to open qr code modal");
+            loglevel.log.error("unable to open qr code modal", error);
           }
         } else {
           this.updateConnectorData({
@@ -292,7 +294,6 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
         }
       }
       loglevel.log.info("awaiting session approval from wallet");
-
       // Await session approval from the wallet.
       const session = await approval();
       this.activeSession = session;
@@ -304,8 +305,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
         qrcodeModal.closeModal();
       }
     } catch (error) {
-      var _message;
-      if ((_message = error.message) !== null && _message !== void 0 && _message.toLowerCase().includes("proposal expired")) {
+      var _error$message;
+      if ((_error$message = error.message) !== null && _error$message !== void 0 && _error$message.toLowerCase().includes("proposal expired")) {
         // Retry if connector status is still connecting
         loglevel.log.info("current connector status: ", this.status);
         if (this.status === constants.CONNECTOR_STATUS.CONNECTING) {
@@ -377,8 +378,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
   }
   async _getSignedMessage(challenge, accounts, chainNamespace) {
     const signedMessage = await this.provider.request({
-      method: chainNamespace === IChainInterface.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.PERSONAL_SIGN : wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE,
-      params: chainNamespace === IChainInterface.CHAIN_NAMESPACES.EIP155 ? [challenge, accounts[0]] : {
+      method: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.PERSONAL_SIGN : wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE,
+      params: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? [challenge, accounts[0]] : {
         data: challenge
       }
     });
@@ -387,24 +388,14 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
 }
 const walletConnectV2Connector = params => {
   return ({
-    projectConfig,
-    coreOptions
+    coreOptions,
+    projectConfig
   }) => {
-    let {
-      projectId
-    } = (params === null || params === void 0 ? void 0 : params.walletConnectInitOptions) || {};
-
-    // use project config if projectId is not set
-    if (projectConfig) {
-      const {
-        wallet_connect_enabled: walletConnectEnabled,
-        wallet_connect_project_id: walletConnectProjectId
-      } = projectConfig;
-      if (walletConnectEnabled && walletConnectProjectId && !projectId) projectId = walletConnectProjectId;
-    }
+    var _params$walletConnect;
+    const projectId = (params === null || params === void 0 || (_params$walletConnect = params.walletConnectInitOptions) === null || _params$walletConnect === void 0 ? void 0 : _params$walletConnect.projectId) || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.walletConnectProjectId);
     const connectorSettings = _objectSpread(_objectSpread({}, params), {}, {
       walletConnectInitOptions: _objectSpread(_objectSpread({}, params === null || params === void 0 ? void 0 : params.walletConnectInitOptions), {}, {
-        projectId
+        projectId: projectId
       })
     });
     return new WalletConnectV2Connector({