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

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

@@ -81,7 +81,8 @@ const getEvmChainConfig = (chainId, web3AuthClientId = "") => {
       logo: "https://images.toruswallet.io/eth.svg",
       rpcTarget: infuraRpcTarget,
       ticker: "ETH",
-      tickerName: "Ethereum"
+      tickerName: "Ethereum",
+      displayName: "Linea"
     };
   }
   if (chainId === 11155111) {

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

@@ -20,7 +20,12 @@ const CONNECTOR_CATEGORY = {
   EXTERNAL: "external",
   IN_APP: "in_app"
 };
+const SMART_ACCOUNT_WALLET_SCOPE = {
+  EMBEDDED: "embedded",
+  ALL: "all"
+};
 
 exports.CONNECTOR_CATEGORY = CONNECTOR_CATEGORY;
 exports.CONNECTOR_EVENTS = CONNECTOR_EVENTS;
 exports.CONNECTOR_STATUS = CONNECTOR_STATUS;
+exports.SMART_ACCOUNT_WALLET_SCOPE = SMART_ACCOUNT_WALLET_SCOPE;

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

@@ -17,10 +17,11 @@ const signerHost = web3AuthNetwork => {
   return constants.SIGNER_MAP[web3AuthNetwork !== null && web3AuthNetwork !== void 0 ? web3AuthNetwork : auth.WEB3AUTH_NETWORK.SAPPHIRE_MAINNET];
 };
 const fetchProjectConfig = async (clientId, web3AuthNetwork, aaProvider) => {
-  const url = new URL(`${signerHost(web3AuthNetwork)}/api/configuration`);
+  // const url = new URL(`${signerHost(web3AuthNetwork)}/api/v2/configuration`);
+  // TODO: remove this before production
+  const url = new URL("https://test-signer.web3auth.io/api/v2/configuration");
   url.searchParams.append("project_id", clientId);
   url.searchParams.append("network", web3AuthNetwork);
-  url.searchParams.append("whitelist", "true");
   if (aaProvider) url.searchParams.append("aa_provider", aaProvider);
   const res = await httpHelpers.get(url.href);
   return res;

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

@@ -9,7 +9,8 @@ const MULTI_CHAIN_CONNECTORS = {
 };
 const SOLANA_CONNECTORS = _objectSpread({}, MULTI_CHAIN_CONNECTORS);
 const EVM_CONNECTORS = _objectSpread({
-  COINBASE: "coinbase"
+  COINBASE: "coinbase",
+  METAMASK: "metamask"
 }, MULTI_CHAIN_CONNECTORS);
 const WALLET_CONNECTORS = _objectSpread(_objectSpread({}, EVM_CONNECTORS), SOLANA_CONNECTORS);
 const CONNECTOR_NAMES = {

package/dist/lib.cjs/connectors/auth-connector/authConnector.js

@@ -2,6 +2,7 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var baseControllers = require('@toruslabs/base-controllers');
 var securePubSub = require('@toruslabs/secure-pub-sub');
 var auth = require('@web3auth/auth');
 var deepmerge = require('deepmerge');
@@ -13,11 +14,9 @@ require('jwt-decode');
 var loglevel = 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 index = require('../../base/wallet/index.js');
-var authConnectionConfig = require('./config/authConnectionConfig.js');
 
 class AuthConnector extends baseConnector.BaseConnector {
   constructor(params) {
@@ -70,6 +69,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     });
     if (!this.coreOptions.clientId) throw index$1.WalletInitializationError.invalidParams("clientId is required before auth's initialization");
     if (!this.authOptions) throw index$1.WalletInitializationError.invalidParams("authOptions is required before auth's initialization");
+    if (this.authConnectionConfig.length === 0) throw index$1.WalletInitializationError.invalidParams("authConnectionConfig is required before auth's initialization");
     const isRedirectResult = this.authOptions.uxMode === auth.UX_MODE.REDIRECT;
     this.authOptions = _objectSpread(_objectSpread({}, this.authOptions), {}, {
       replaceUrlOnRedirect: isRedirectResult,
@@ -79,7 +79,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       clientId: this.coreOptions.clientId,
       network: this.coreOptions.web3AuthNetwork,
       sdkMode: auth.SDK_MODE.IFRAME,
-      authConnectionConfig: this.authConnectionConfig
+      authConnectionConfig: this.authConnectionConfig.filter(x => !x.isDefault)
     }));
     loglevel.log.debug("initializing auth connector init", this.authOptions);
     await this.authInstance.init();
@@ -352,8 +352,8 @@ class AuthConnector extends baseConnector.BaseConnector {
       authConnectionId: params.authConnectionId,
       groupedAuthConnectionId: params.groupedAuthConnectionId
     });
-    if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw index$1.WalletLoginError.connectionError("Login provider is not available");
-    const jwtParams = _objectSpread(_objectSpread(_objectSpread({}, providerConfig.jwtParameters), params.extraLoginOptions || {}), {}, {
+    if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw index$1.WalletLoginError.connectionError("Invalid auth connection.");
+    const jwtParams = _objectSpread(_objectSpread(_objectSpread({}, providerConfig.jwtParameters || {}), params.extraLoginOptions || {}), {}, {
       login_hint: params.login_hint || ((_params$extraLoginOpt3 = params.extraLoginOptions) === null || _params$extraLoginOpt3 === void 0 ? void 0 : _params$extraLoginOpt3.login_hint)
     });
     const nonce = auth.randomId();
@@ -372,10 +372,11 @@ class AuthConnector extends baseConnector.BaseConnector {
       jwtParams,
       customState: {
         nonce,
-        dapp_redirect_url: this.authOptions.redirectUrl,
         appState: params.appState,
-        uxMode: this.authOptions.uxMode,
-        whiteLabel: JSON.stringify(this.authOptions.whiteLabel),
+        // use the default settings from the auth instance.
+        dapp_redirect_url: this.authInstance.options.redirectUrl,
+        uxMode: this.authInstance.options.uxMode,
+        whiteLabel: JSON.stringify(this.authInstance.options.whiteLabel),
         loginParams: JSON.stringify(loginParams)
       },
       web3AuthClientId: this.coreOptions.clientId,
@@ -431,7 +432,16 @@ class AuthConnector extends baseConnector.BaseConnector {
       authConnectionId: params.authConnectionId,
       groupedAuthConnectionId: params.groupedAuthConnectionId
     });
-    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection)) throw index$1.WalletLoginError.connectionError("Login provider is not available");
+    // throw error only when we cannot find the login config and authConnectionId is not provided in the params.
+    // otherwise, we will use the params to create a new auth connection config in the auth instance.
+    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection) && !params.authConnectionId) throw index$1.WalletLoginError.connectionError("Invalid auth connection.");
+    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection)) {
+      this.authInstance.options.authConnectionConfig.push({
+        authConnection: params.authConnection,
+        authConnectionId: params.authConnectionId,
+        groupedAuthConnectionId: params.groupedAuthConnectionId
+      });
+    }
     const loginParams = baseControllers.cloneDeep(params);
     loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, loginParams.extraLoginOptions || {}), {}, {
       login_hint: params.login_hint || ((_params$extraLoginOpt5 = params.extraLoginOptions) === null || _params$extraLoginOpt5 === void 0 ? void 0 : _params$extraLoginOpt5.login_hint)
@@ -452,7 +462,8 @@ class AuthConnector extends baseConnector.BaseConnector {
       if (authConnectionId) {
         return x.authConnection === authConnection && x.authConnectionId === authConnectionId;
       }
-      return x.authConnection === authConnection;
+      // return the default auth connection, if not found, return undefined
+      return x.authConnection === authConnection && x.isDefault;
     });
     return providerConfig;
   }
@@ -462,31 +473,67 @@ const authConnector = params => {
     projectConfig,
     coreOptions
   }) => {
-    var _coreOptions$uiConfig, _coreOptions$walletSe;
+    var _coreOptions$uiConfig, _coreOptions$walletSe, _coreOptions$walletSe2, _coreOptions$walletSe3;
     // Connector settings
     const connectorSettings = {};
     const {
       whitelist,
-      whitelabel
+      whitelabel,
+      sessionTime
     } = projectConfig;
     if (whitelist) connectorSettings.originData = whitelist.signed_urls;
+    if (sessionTime) connectorSettings.sessionTime = sessionTime;
     if ((_coreOptions$uiConfig = coreOptions.uiConfig) !== null && _coreOptions$uiConfig !== void 0 && _coreOptions$uiConfig.uxMode) connectorSettings.uxMode = coreOptions.uiConfig.uxMode;
     const uiConfig = deepmerge(baseControllers.cloneDeep(whitelabel || {}), coreOptions.uiConfig || {});
     if (!uiConfig.mode) uiConfig.mode = "light";
     connectorSettings.whiteLabel = uiConfig;
     const finalConnectorSettings = deepmerge.all([{
       uxMode: auth.UX_MODE.POPUP,
-      buildEnv: auth.BUILD_ENV.PRODUCTION
+      buildEnv: coreOptions.authBuildEnv || auth.BUILD_ENV.PRODUCTION
     },
     // default settings
-    (params === null || params === void 0 ? void 0 : params.connectorSettings) || {}, connectorSettings]);
+    connectorSettings, (params === null || params === void 0 ? void 0 : params.connectorSettings) || {}]);
     // WS settings
-    const isKeyExportEnabled = typeof projectConfig.key_export_enabled === "boolean" ? projectConfig.key_export_enabled : true;
+    const {
+      enableKeyExport,
+      walletUi
+    } = projectConfig;
+    const isKeyExportEnabled = typeof enableKeyExport === "boolean" ? enableKeyExport : true;
+    const {
+      enablePortfolioWidget = false,
+      enableTokenDisplay = true,
+      enableNftDisplay = true,
+      enableWalletConnect = true,
+      enableBuyButton = true,
+      enableSendButton = true,
+      enableSwapButton = true,
+      enableReceiveButton = true,
+      enableShowAllTokensButton = true,
+      enableConfirmationModal = false,
+      portfolioWidgetPosition = baseControllers.BUTTON_POSITION.BOTTOM_LEFT,
+      defaultPortfolio = "token"
+    } = walletUi || {};
+    const projectConfigWhiteLabel = {
+      showWidgetButton: enablePortfolioWidget,
+      hideNftDisplay: !enableNftDisplay,
+      hideTokenDisplay: !enableTokenDisplay,
+      hideTransfers: !enableSendButton,
+      hideTopup: !enableBuyButton,
+      hideReceive: !enableReceiveButton,
+      hideSwap: !enableSwapButton,
+      hideShowAllTokens: !enableShowAllTokensButton,
+      hideWalletConnect: !enableWalletConnect,
+      buttonPosition: portfolioWidgetPosition,
+      defaultPortfolio
+    };
+    const whiteLabel = deepmerge.all([projectConfigWhiteLabel, uiConfig, ((_coreOptions$walletSe = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe === void 0 ? void 0 : _coreOptions$walletSe.whiteLabel) || {}]);
+    const confirmationStrategy = (_coreOptions$walletSe2 = (_coreOptions$walletSe3 = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe3 === void 0 ? void 0 : _coreOptions$walletSe3.confirmationStrategy) !== null && _coreOptions$walletSe2 !== void 0 ? _coreOptions$walletSe2 : enableConfirmationModal ? baseControllers.CONFIRMATION_STRATEGY.MODAL : baseControllers.CONFIRMATION_STRATEGY.AUTO_APPROVE;
     const finalWsSettings = _objectSpread(_objectSpread({}, coreOptions.walletServicesConfig), {}, {
-      whiteLabel: _objectSpread(_objectSpread({}, uiConfig), (_coreOptions$walletSe = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe === void 0 ? void 0 : _coreOptions$walletSe.whiteLabel),
+      confirmationStrategy,
+      whiteLabel,
       accountAbstractionConfig: coreOptions.accountAbstractionConfig,
-      enableLogging: coreOptions.enableLogging
-      // enableKeyExport: keyExportEnabled,
+      enableLogging: coreOptions.enableLogging,
+      enableKeyExport: enableKeyExport
     });
     // Core options
     if (coreOptions.privateKeyProvider) coreOptions.privateKeyProvider.setKeyExportFlag(isKeyExportEnabled);
@@ -495,7 +542,8 @@ const authConnector = params => {
       walletServicesSettings: finalWsSettings,
       loginSettings: params === null || params === void 0 ? void 0 : params.loginSettings,
       coreOptions,
-      authConnectionConfig: authConnectionConfig.getAuthConnectionConfig(finalConnectorSettings.buildEnv, coreOptions.web3AuthNetwork)
+      // TODO: check, test this and may need to send modal config here later on.!!
+      authConnectionConfig: projectConfig.embeddedWalletAuth
     });
   };
 };

package/dist/lib.cjs/connectors/injected-solana-connector/walletStandardConnector.js

@@ -14,7 +14,6 @@ require('../../base/plugin/IPlugin.js');
 var utils = require('../../base/utils.js');
 var utils$1 = require('../../providers/solana-provider/providers/injectedProviders/utils.js');
 var walletStandardProvider = require('../../providers/solana-provider/providers/injectedProviders/walletStandardProvider.js');
-require('../../providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyProvider.js');
 var baseControllers = require('@toruslabs/base-controllers');
 require('@web3auth/ws-embed');
 require('@solana/web3.js');

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

@@ -30,7 +30,6 @@ 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('../../providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyProvider.js');
 require('@web3auth/ws-embed');
 var walletConnectV2Utils = require('./walletConnectV2Utils.js');
 

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

@@ -12,6 +12,7 @@ require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 require('@toruslabs/constants');
 require('@toruslabs/http-helpers');
+var utils = require('../utils.js');
 
 exports.DEFAULT_EIP155_METHODS = void 0;
 (function (DEFAULT_EIP155_METHODS) {
@@ -45,69 +46,13 @@ const SOLANA_CAIP_CHAIN_MAP = {
   "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 = [];

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

@@ -72,8 +72,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    // use a global wc project id if not provided
-    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) || "d3c63f19f9582f8ba48e982057eb096b";
+    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;
     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;
@@ -389,23 +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({

package/dist/lib.cjs/index.js

@@ -44,7 +44,6 @@ var jrpcClient = require('./providers/ethereum-provider/rpc/jrpcClient.js');
 var walletMidddleware = require('./providers/ethereum-provider/rpc/walletMidddleware.js');
 var utils$4 = require('./providers/solana-provider/providers/injectedProviders/utils.js');
 var walletStandardProvider = require('./providers/solana-provider/providers/injectedProviders/walletStandardProvider.js');
-var solanaPrivateKeyProvider = require('./providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyProvider.js');
 var JrpcClient = require('./providers/solana-provider/rpc/JrpcClient.js');
 var solanaRpcMiddlewares = require('./providers/solana-provider/rpc/solanaRpcMiddlewares.js');
 var solanaWallet = require('./providers/solana-provider/solanaWallet.js');
@@ -67,6 +66,7 @@ exports.BaseConnector = baseConnector.BaseConnector;
 exports.CONNECTOR_CATEGORY = constants.CONNECTOR_CATEGORY;
 exports.CONNECTOR_EVENTS = constants.CONNECTOR_EVENTS;
 exports.CONNECTOR_STATUS = constants.CONNECTOR_STATUS;
+exports.SMART_ACCOUNT_WALLET_SCOPE = constants.SMART_ACCOUNT_WALLET_SCOPE;
 Object.defineProperty(exports, "AUTH_CONNECTION", {
 	enumerable: true,
 	get: function () { return auth.AUTH_CONNECTION; }
@@ -209,7 +209,6 @@ exports.createEthProviderConfigMiddleware = jrpcClient.createEthProviderConfigMi
 exports.createWalletMiddleware = walletMidddleware.createWalletMiddleware;
 exports.getSolanaChainByChainConfig = utils$4.getSolanaChainByChainConfig;
 exports.WalletStandardProvider = walletStandardProvider.WalletStandardProvider;
-exports.SolanaPrivateKeyProvider = solanaPrivateKeyProvider.SolanaPrivateKeyProvider;
 exports.createConfigMiddleware = JrpcClient.createConfigMiddleware;
 exports.createSolanaChainIdMiddleware = JrpcClient.createSolanaChainIdMiddleware;
 exports.createSolanaJsonRpcClient = JrpcClient.createSolanaJsonRpcClient;