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

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

@@ -1,6 +1,7 @@
 import { WalletInitializationError } from '../errors/index.js';
-import { CHAIN_NAMESPACES } from './IChainInterface.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 
+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,19 +212,20 @@ 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,
       chainId: "0x65",
-      rpcTarget: "https://rpc.ankr.com/solana",
+      rpcTarget: "https://api.mainnet-beta.solana.com",
       displayName: "Solana Mainnet",
       blockExplorerUrl: "https://explorer.solana.com",
       ticker: "SOL",
       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,62 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { SafeEventEmitter } from '@web3auth/auth';
+import { 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';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+
+class BaseConnector extends SafeEventEmitter {
+  constructor(options) {
+    super();
+    _defineProperty(this, "connectorData", {});
+    _defineProperty(this, "isInjected", void 0);
+    _defineProperty(this, "coreOptions", void 0);
+    _defineProperty(this, "rehydrated", false);
+    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

@@ -1,8 +1,6 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { CustomError } from 'ts-custom-error';
 
-// @flow
-
 function serializeError(args) {
   // Find first Error or create an "unknown" Error to keep stack trace.
   const index = args.findIndex(arg => arg instanceof Error);
@@ -52,7 +50,6 @@ class WalletInitializationError extends Web3AuthError {
   constructor(code, message, cause) {
     // takes care of stack and proto
     super(code, message, cause);
-
     // Set name explicitly as minification can mangle class names
     Object.defineProperty(this, "name", {
       value: "WalletInitializationError"
@@ -61,7 +58,6 @@ class WalletInitializationError extends Web3AuthError {
   static fromCode(code, extraMessage = "", cause) {
     return new WalletInitializationError(code, `${WalletInitializationError.messages[code]}, ${extraMessage}`, cause);
   }
-
   // Custom methods
   static notFound(extraMessage = "", cause) {
     return WalletInitializationError.fromCode(5001, extraMessage, cause);
@@ -81,7 +77,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) {
@@ -100,7 +96,6 @@ class WalletInitializationError extends Web3AuthError {
     return WalletInitializationError.fromCode(5013, extraMessage, cause);
   }
 }
-
 /**
  * wallet login errors
  */
@@ -112,7 +107,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",
@@ -123,7 +118,6 @@ class WalletLoginError extends Web3AuthError {
   constructor(code, message, cause) {
     // takes care of stack and proto
     super(code, message, cause);
-
     // Set name explicitly as minification can mangle class names
     Object.defineProperty(this, "name", {
       value: "WalletLoginError"
@@ -176,7 +170,6 @@ class WalletOperationsError extends Web3AuthError {
   constructor(code, message, cause) {
     // takes care of stack and proto
     super(code, message, cause);
-
     // Set name explicitly as minification can mangle class names
     Object.defineProperty(this, "name", {
       value: "WalletOperationsError"
@@ -185,7 +178,6 @@ class WalletOperationsError extends Web3AuthError {
   static fromCode(code, extraMessage = "", cause) {
     return new WalletOperationsError(code, `${WalletOperationsError.messages[code]}, ${extraMessage}`, cause);
   }
-
   // Custom methods
   static chainIDNotAllowed(extraMessage = "", cause) {
     return WalletOperationsError.fromCode(5201, extraMessage, cause);
@@ -206,7 +198,6 @@ class WalletProviderError extends Web3AuthError {
   constructor(code, message, cause) {
     // takes care of stack and proto
     super(code, message, cause);
-
     // Set name explicitly as minification can mangle class names
     Object.defineProperty(this, "name", {
       value: "WalletProviderError"
@@ -215,7 +206,6 @@ class WalletProviderError extends Web3AuthError {
   static fromCode(code, extraMessage = "", cause) {
     return new WalletOperationsError(code, `${WalletProviderError.messages[code]}, ${extraMessage}`, cause);
   }
-
   // Custom methods
   static invalidRequestArgs(extraMessage = "", cause) {
     return WalletOperationsError.fromCode(5301, extraMessage, cause);

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

@@ -1,5 +1,5 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { CHAIN_NAMESPACES } from '../chain/IChainInterface.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 
 const PLUGIN_NAMESPACES = _objectSpread(_objectSpread({}, CHAIN_NAMESPACES), {}, {
   MULTICHAIN: "multichain"

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

@@ -5,7 +5,6 @@ class WalletServicesPluginError extends Web3AuthError {
   constructor(code, message, cause) {
     // takes care of stack and proto
     super(code, message, cause);
-
     // Set name explicitly as minification can mangle class names
     Object.defineProperty(this, "name", {
       value: "WalletServicesPluginError"
@@ -17,7 +16,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 +52,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.",
@@ -68,7 +67,6 @@ class NFTCheckoutPluginError extends Web3AuthError {
   constructor(code, message, cause) {
     // takes care of stack and proto
     super(code, message, cause);
-
     // Set name explicitly as minification can mangle class names
     Object.defineProperty(this, "name", {
       value: "NFTCheckoutPluginError"

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

@@ -1,7 +1,12 @@
 export { cloneDeep } from '@toruslabs/base-controllers';
 import { SIGNER_MAP } from '@toruslabs/constants';
 import { get } from '@toruslabs/http-helpers';
+import '@babel/runtime/helpers/defineProperty';
 import { WEB3AUTH_NETWORK } from '@web3auth/auth';
+import './errors/index.js';
+import './wallet/index.js';
+import './connector/constants.js';
+import 'jwt-decode';
 
 const isHexStrict = hex => {
   return (typeof hex === "string" || typeof hex === "number") && /^(-)?0x[0-9a-f]*$/i.test(hex);
@@ -22,22 +27,17 @@ const fetchWalletRegistry = async url => {
   const res = await get(url || "https://assets.web3auth.io/v1/wallet-registry.json");
   return res;
 };
-
 // Normalize wallet name to a standard format, used for external wallets that are auto-detected by MIPD (EIP-6963 and Wallet Standard)
 const normalizeWalletName = name => {
   let normalizedName = name.toLowerCase();
   // remove decriptive part after | e.g. "Crypto.com | Defi Wallet" => "Crypto.com"
   normalizedName = normalizedName.split("|")[0];
-
   // replace -  with space e.g. "Trust - Wallet" => "Trust Wallet"
   normalizedName = normalizedName.replace(/-/g, " ");
-
   // replace multiple spaces with single space
   normalizedName = normalizedName.replace(/\s+/g, " ");
-
   // remove trailing "wallet" e.g. "Trust Wallet" => "Trust", "GateWallet" => "Gate"
   normalizedName = normalizedName.replace(/wallet$/i, "").trim();
-
   // replace space with -
   normalizedName = normalizedName.replace(/\s/g, "-");
   return normalizedName;

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 };