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

package/dist/lib.esm/{adapters/wallet-connect-v2-adapter → connectors/wallet-connect-v2-connector}/WalletConnectV2Provider.js

@@ -2,16 +2,15 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { getAccountsFromNamespaces, parseAccountId } from '@walletconnect/utils';
 import { providerErrors, JRPCEngine, providerFromEngine } from '@web3auth/auth';
-import { getChainConfig } from '../../base/chain/config.js';
 import { CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { WalletLoginError } from '../../base/errors/index.js';
 import { log } from '../../base/loglevel.js';
-import { switchChain, addChain, getAccounts, getEthProviderHandlers, getSolProviderHandlers } from './walletConnectV2Utils.js';
+import { BaseProvider } from '../../providers/base-provider/baseProvider.js';
+import { switchChain, getAccounts, getEthProviderHandlers, getSolProviderHandlers } from './walletConnectV2Utils.js';
 import { createEthMiddleware, createEthChainSwitchMiddleware } from '../../providers/ethereum-provider/rpc/ethRpcMiddlewares.js';
 import { createEthJsonRpcClient } from '../../providers/ethereum-provider/rpc/jrpcClient.js';
 import { createSolanaMiddleware } from '../../providers/solana-provider/rpc/solanaRpcMiddlewares.js';
 import { createSolanaJsonRpcClient } from '../../providers/solana-provider/rpc/JrpcClient.js';
-import { BaseProvider } from '../../providers/base-provider/baseProvider.js';
 
 var _WalletConnectV2Provider;
 class WalletConnectV2Provider extends BaseProvider {
@@ -22,7 +21,8 @@ class WalletConnectV2Provider extends BaseProvider {
   }) {
     super({
       config: {
-        chainConfig: config.chainConfig,
+        chain: config.chain,
+        chains: config.chains,
         skipLookupNetwork: !!config.skipLookupNetwork
       },
       state: _objectSpread(_objectSpread({}, state || {}), {}, {
@@ -45,7 +45,7 @@ class WalletConnectV2Provider extends BaseProvider {
   }
   async setupProvider(connector) {
     this.onConnectorStateUpdate(connector);
-    await this.setupEngine(connector);
+    await this.setupEngine(connector, this.config.chain.chainId);
   }
   async switchChain({
     chainId
@@ -54,70 +54,46 @@ class WalletConnectV2Provider extends BaseProvider {
       message: "Connector is not initialized, pass wallet connect connector in constructor",
       code: 4902
     });
-    const currentChainConfig = this.getChainConfig(chainId);
+    const currentChainConfig = this.getChain(chainId);
     const {
       chainId: currentChainId
-    } = this.config.chainConfig;
+    } = currentChainConfig;
     const currentNumChainId = parseInt(currentChainId, 16);
     await switchChain({
       connector: this.connector,
       chainId: currentNumChainId,
       newChainId: chainId
     });
-    this.configure({
-      chainConfig: currentChainConfig
-    });
-    await this.setupEngine(this.connector);
-    this.lookupNetwork(this.connector);
-  }
-  async addChain(chainConfig) {
-    const {
-      chainId: currentChainId
-    } = this.config.chainConfig;
-    const numChainId = parseInt(currentChainId, 16);
-    await addChain({
-      connector: this.connector,
-      chainId: numChainId,
-      chainConfig: {
-        chainId: chainConfig.chainId,
-        chainName: chainConfig.displayName,
-        nativeCurrency: {
-          name: chainConfig.tickerName,
-          symbol: chainConfig.ticker.toLocaleUpperCase(),
-          decimals: chainConfig.decimals || 18
-        },
-        rpcUrls: [chainConfig.rpcTarget],
-        blockExplorerUrls: [chainConfig.blockExplorerUrl],
-        iconUrls: [chainConfig.logo]
-      }
+    await this.setupEngine(this.connector, chainId);
+    this.lookupNetwork(this.connector, chainId);
+    this.update({
+      chainId
     });
-    super.addChain(chainConfig);
   }
 
   // no need to implement this method in wallet connect v2.
-  async lookupNetwork(_) {
-    const newChainId = this.config.chainConfig.chainId;
-    this.update({
-      chainId: newChainId
-    });
-    this.emit("chainChanged", newChainId);
-    this.emit("connect", {
-      chainId: newChainId
-    });
-    return this.config.chainConfig.chainId;
+  async lookupNetwork(_, chainId) {
+    return chainId;
   }
-  async setupEngine(connector) {
-    if (this.config.chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
-      return this.setupEthEngine(connector);
-    } else if (this.config.chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
-      return this.setupSolEngine(connector);
+  async setupEngine(connector, chainId) {
+    const chain = this.getChain(chainId);
+    if (chain.chainNamespace === CHAIN_NAMESPACES.EIP155) {
+      await this.setupEthEngine(connector, chainId);
+    } else if (chain.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      await this.setupSolEngine(connector, chainId);
+    } else {
+      throw new Error(`Unsupported chainNamespace: ${chain.chainNamespace}`);
     }
-    throw new Error(`Unsupported chainNamespace: ${this.config.chainConfig.chainNamespace}`);
-  }
-  async setupEthEngine(connector) {
-    const {
+    this.emit("chainChanged", chainId);
+    this.emit("connect", {
       chainId
-    } = this.config.chainConfig;
+    });
+    this.update({
+      chainId
+    });
+  }
+  async setupEthEngine(connector, chainId) {
+    const chain = this.getChain(chainId);
     const numChainId = parseInt(chainId, 16);
     const providerHandlers = getEthProviderHandlers({
       connector,
@@ -132,17 +108,15 @@ class WalletConnectV2Provider extends BaseProvider {
     const engine = new JRPCEngine();
     const {
       networkMiddleware
-    } = createEthJsonRpcClient(this.config.chainConfig);
+    } = createEthJsonRpcClient(chain);
     engine.push(ethMiddleware);
     engine.push(chainSwitchMiddleware);
     engine.push(networkMiddleware);
     const provider = providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
   }
-  async setupSolEngine(connector) {
-    const {
-      chainId
-    } = this.config.chainConfig;
+  async setupSolEngine(connector, chainId) {
+    const chain = this.getChain(chainId);
     const providerHandlers = getSolProviderHandlers({
       connector,
       chainId
@@ -155,7 +129,7 @@ class WalletConnectV2Provider extends BaseProvider {
     const engine = new JRPCEngine();
     const {
       networkMiddleware
-    } = createSolanaJsonRpcClient(this.config.chainConfig);
+    } = createSolanaJsonRpcClient(chain);
     engine.push(solMiddleware);
     engine.push(networkMiddleware);
     const provider = providerFromEngine(engine);
@@ -163,27 +137,6 @@ class WalletConnectV2Provider extends BaseProvider {
   }
   getEthChainSwitchMiddleware() {
     const chainSwitchHandlers = {
-      addChain: async params => {
-        const {
-          chainId,
-          chainName,
-          rpcUrls,
-          blockExplorerUrls,
-          nativeCurrency,
-          iconUrls
-        } = params;
-        this.addChain({
-          chainNamespace: CHAIN_NAMESPACES.EIP155,
-          chainId,
-          ticker: (nativeCurrency === null || nativeCurrency === void 0 ? void 0 : nativeCurrency.symbol) || "ETH",
-          tickerName: (nativeCurrency === null || nativeCurrency === void 0 ? void 0 : nativeCurrency.name) || "Ether",
-          displayName: chainName,
-          rpcTarget: rpcUrls[0],
-          blockExplorerUrl: (blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0]) || "",
-          decimals: (nativeCurrency === null || nativeCurrency === void 0 ? void 0 : nativeCurrency.decimals) || 18,
-          logo: (iconUrls === null || iconUrls === void 0 ? void 0 : iconUrls[0]) || "https://images.toruswallet.io/eth.svg"
-        });
-      },
       switchChain: async params => {
         const {
           chainId
@@ -246,16 +199,12 @@ class WalletConnectV2Provider extends BaseProvider {
         const connectedHexChainId = `0x${connectedChainId.toString(16)}`;
 
         // Check if chainId changed and trigger event
-        if (connectedHexChainId && this.state.chainId !== connectedHexChainId) {
-          const maybeConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, connectedHexChainId);
+        const {
+          currentChain
+        } = this;
+        if (connectedHexChainId && currentChain.chainId !== connectedHexChainId) {
           // Handle rpcUrl update
-          this.configure({
-            chainConfig: _objectSpread(_objectSpread({}, maybeConfig), {}, {
-              chainId: connectedHexChainId,
-              chainNamespace: CHAIN_NAMESPACES.EIP155
-            })
-          });
-          await this.setupEngine(connector);
+          await this.setupEngine(connector, connectedHexChainId);
         }
       }
     });
@@ -265,7 +214,8 @@ _WalletConnectV2Provider = WalletConnectV2Provider;
 _defineProperty(WalletConnectV2Provider, "getProviderInstance", async params => {
   const providerFactory = new _WalletConnectV2Provider({
     config: {
-      chainConfig: params.chainConfig,
+      chain: params.chain,
+      chains: params.chains,
       skipLookupNetwork: params.skipLookupNetwork
     }
   });

package/dist/lib.esm/{adapters/wallet-connect-v2-adapter → connectors/wallet-connect-v2-connector}/config.js

@@ -140,33 +140,30 @@ const getRequiredNamespaces = chains => {
     events: getSupportedEventsByNamespace(namespace)
   }]));
 };
-const getWalletConnectV2Settings = async (namespace, chainIds, projectID) => {
-  if (namespace === CHAIN_NAMESPACES.EIP155 || namespace === CHAIN_NAMESPACES.SOLANA) {
-    const appMetadata = await getSiteMetadata();
-    const adapterSettings = {
-      walletConnectInitOptions: {
-        projectId: projectID,
-        relayUrl: "wss://relay.walletconnect.com",
-        metadata: {
-          name: appMetadata.name,
-          description: appMetadata.name,
-          url: window.location.origin,
-          icons: [appMetadata.icon || ""]
-        }
+const getWalletConnectV2Settings = async (chains, projectID) => {
+  const appMetadata = await getSiteMetadata();
+  const connectorSettings = {
+    walletConnectInitOptions: {
+      projectId: projectID,
+      relayUrl: "wss://relay.walletconnect.com",
+      metadata: {
+        name: appMetadata.name,
+        description: appMetadata.name,
+        url: window.location.origin,
+        icons: [appMetadata.icon || ""]
       }
-    };
-    const chainNamespaces = chainIds.map(chainId => {
-      return `${namespace}:${namespace === CHAIN_NAMESPACES.SOLANA ? SOLANA_CAIP_CHAIN_MAP[chainId] : parseInt(chainId, 16)}`;
-    });
-    const loginSettings = {
-      optionalNamespaces: getRequiredNamespaces(chainNamespaces)
-    };
-    return {
-      adapterSettings,
-      loginSettings
-    };
-  }
-  throw new Error(`Unsupported chain namespace: ${namespace}`);
+    }
+  };
+  const chainNamespaces = chains.map(chain => {
+    return `${chain.chainNamespace}:${chain.chainNamespace === CHAIN_NAMESPACES.SOLANA ? SOLANA_CAIP_CHAIN_MAP[chain.chainId] : parseInt(chain.chainId, 16)}`;
+  });
+  const loginSettings = {
+    optionalNamespaces: getRequiredNamespaces(chainNamespaces)
+  };
+  return {
+    connectorSettings,
+    loginSettings
+  };
 };
 
 export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, SOLANA_CAIP_CHAIN_MAP, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings };

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

@@ -0,0 +1,3 @@
+export { DEFAULT_EIP155_METHODS, DEFAULT_EIP_155_EVENTS, DEFAULT_SOLANA_EVENTS, DEFAULT_SOLANA_METHODS, SOLANA_CAIP_CHAIN_MAP, getNamespacesFromChains, getRequiredNamespaces, getSupportedEventsByNamespace, getSupportedMethodsByNamespace, getWalletConnectV2Settings } from './config.js';
+export { walletConnectV2Connector } from './walletConnectV2Connector.js';
+export { WalletConnectV2Provider } from './WalletConnectV2Provider.js';