Merge branch 'master' into feat/sdk-v10-chains

Author: tanguyenvn

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-alpha.1",
   "npmClient": "npm"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/modal",
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-alpha.1",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/ui",
@@ -74,7 +74,7 @@
   "dependencies": {
     "@toruslabs/http-helpers": "^7.0.0",
     "@web3auth/auth": "^9.6.4",
-    "@web3auth/no-modal": "^10.0.0-alpha.0",
+    "@web3auth/no-modal": "^10.0.0-alpha.1",
     "bowser": "^2.11.0",
     "classnames": "^2.5.1",
     "copy-to-clipboard": "^3.3.3",

packages/modal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-alpha.1",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",

packages/no-modal/package.json

@@ -59,10 +59,9 @@ export interface IWeb3AuthCoreOptions {
   chains?: CustomChainConfig[];
 
   /**
-   * TODO: should we make this mandatory? Is it possible to configure it from Dashboard?
    * default chain Id to use
    */
-  defaultChainId: string;
+  defaultChainId?: string;
 
   /**
    * setting to true will enable logs
@@ -75,6 +74,7 @@ export interface IWeb3AuthCoreOptions {
    *
    * @defaultValue "local"
    */
+  // TODO: rename this to match customauth, sfa
   storageType?: "session" | "local";
 
   /**

packages/no-modal/src/base/core/IWeb3Auth.ts

@@ -127,6 +127,8 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
           });
           break;
         }
+        case CHAIN_NAMESPACES.XRPL:
+          throw WalletLoginError.connectionError("Private key provider is required for XRPL");
         default: {
           const { CommonPrivateKeyProvider } = await import("@/core/base-provider");
           this.privateKeyProvider = new CommonPrivateKeyProvider({
@@ -350,10 +352,10 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 }
 
-export const authConnector = (params?: AuthConnectorOptions): ConnectorFn => {
+export const authConnector = (params?: Omit<AuthConnectorOptions, "coreOptions">): ConnectorFn => {
   return ({ projectConfig, coreOptions }: ConnectorParams) => {
     // Connector settings
-    const connectorSettings: AuthConnectorOptions["connectorSettings"] = { uxMode: UX_MODE.POPUP };
+    const connectorSettings: AuthConnectorOptions["connectorSettings"] = {};
     const { sms_otp_enabled: smsOtpEnabled, whitelist } = projectConfig;
     if (smsOtpEnabled !== undefined) {
       connectorSettings.loginConfig = {
@@ -370,7 +372,11 @@ export const authConnector = (params?: AuthConnectorOptions): ConnectorFn => {
     const uiConfig = deepmerge(cloneDeep(projectConfig?.whitelabel || {}), coreOptions.uiConfig || {});
     if (!uiConfig.mode) uiConfig.mode = "light";
     connectorSettings.whiteLabel = uiConfig;
-    const finalConnectorSettings = deepmerge(params?.connectorSettings || {}, connectorSettings) as AuthConnectorOptions["connectorSettings"];
+    const finalConnectorSettings = deepmerge.all([
+      { uxMode: UX_MODE.POPUP }, // default settings
+      params?.connectorSettings || {},
+      connectorSettings,
+    ]) as AuthConnectorOptions["connectorSettings"];
 
     // WS settings
     const isKeyExportEnabled = typeof projectConfig.key_export_enabled === "boolean" ? projectConfig.key_export_enabled : true;

packages/no-modal/src/connectors/auth-connector/authConnector.ts

@@ -83,7 +83,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       })),
     };
 
-    this.currentChainId = options.defaultChainId;
+    this.currentChainId = options.defaultChainId || chains[0].chainId;
   }
 
   get currentChain(): CustomChainConfig {
@@ -230,10 +230,10 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
   protected initCachedConnectorAndChainId() {
     this.cachedConnector = storageAvailable(this.storage) ? window[this.storage].getItem(CONNECTOR_CACHE_KEY) : null;
-    // init chainId using cached chainId if it exists and is valid, otherwise use the first chain
+    // init chainId using cached chainId if it exists and is valid, otherwise use the defaultChainId or the first chain
     const cachedChainId = storageAvailable(this.storage) ? window[this.storage].getItem(CURRENT_CHAIN_CACHE_KEY) : null;
     const isCachedChainIdValid = cachedChainId && this.coreOptions.chains.some((chain) => chain.chainId === cachedChainId);
-    this.currentChainId = isCachedChainIdValid ? cachedChainId : this.coreOptions.defaultChainId;
+    this.currentChainId = isCachedChainIdValid ? cachedChainId : this.coreOptions.defaultChainId || this.coreOptions.chains[0].chainId;
   }
 
   protected async setupCommonJRPCProvider() {
@@ -266,8 +266,8 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
     // add injected connectors
     const isMipdEnabled = this.coreOptions.multiInjectedProviderDiscovery ?? true;
+    const chainNamespaces = new Set(this.coreOptions.chains.map((chain) => chain.chainNamespace));
     if (isMipdEnabled) {
-      const chainNamespaces = new Set(this.coreOptions.chains.map((chain) => chain.chainNamespace));
       // Solana chains
       if (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA)) {
         const { createSolanaMipd, hasSolanaWalletStandardFeatures, walletStandardConnector } = await import("@/core/injected-solana-connector");
@@ -295,16 +295,16 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
         });
         connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
       }
+    }
 
-      // add WalletConnectV2 connector if enabled
-      if (
-        projectConfig.wallet_connect_enabled &&
-        projectConfig.wallet_connect_project_id &&
-        (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))
-      ) {
-        const { walletConnectV2Connector } = await import("@/core/wallet-connect-v2-connector");
-        connectorFns.push(walletConnectV2Connector());
-      }
+    // add WalletConnectV2 connector if enabled
+    if (
+      projectConfig.wallet_connect_enabled &&
+      projectConfig.wallet_connect_project_id &&
+      (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))
+    ) {
+      const { walletConnectV2Connector } = await import("@/core/wallet-connect-v2-connector");
+      connectorFns.push(walletConnectV2Connector());
     }
 
     const connectors = connectorFns.map((connectorFn) => connectorFn(config));
@@ -433,7 +433,6 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
    * @throws WalletInitializationError If no chain is found for the connector's namespace
    */
   protected getInitialChainIdForConnector(connector: IConnector<unknown>): CustomChainConfig {
-    // TODO: combine this logic with chainId input from web3auth options
     let initialChain = this.currentChain;
     if (initialChain.chainNamespace !== connector.connectorNamespace && connector.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN) {
       initialChain = this.coreOptions.chains.find((x) => x.chainNamespace === connector.connectorNamespace);

packages/no-modal/src/noModal.ts

@@ -118,12 +118,17 @@ export abstract class BaseProvider<C extends BaseProviderConfig, S extends BaseP
     if (this._providerEngineProxy) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (this._providerEngineProxy as any).setTarget(provider);
+      // re-emit events from provider
+      this._providerEngineProxy.eventNames().forEach((event) => {
+        provider.on(event as keyof ProviderEvents, (...args) => {
+          // eslint-disable-next-line
+          this.emit(event as keyof BaseProviderEvents<S>, ...(args as any));
+        });
+      });
+      this.handleChainChangedProvider();
     } else {
-      // TODO: need to test if provider.on("chainChanged") & other events are re-emitted by commonjrpc provider
       this._providerEngineProxy = createEventEmitterProxy<SafeEventEmitterProvider>(provider);
     }
-
-    this.handleChainChangedProvider();
   }
 
   public setKeyExportFlag(flag: boolean): void {
@@ -146,7 +151,6 @@ export abstract class BaseProvider<C extends BaseProviderConfig, S extends BaseP
     // This is only added because we don't have ethereum and solana private key providers anymore
     this.provider.on("chainChanged", (chainId: string) => {
       this.update({ chainId } as Partial<S>);
-      this.emit("chainChanged", chainId);
     });
   }