@web3auth/modal 5.2.0 → 6.0.0-alpha.0

package/dist/types/default.d.ts

@@ -1,5 +1,7 @@
-import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin";
+import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin-utils";
 import { CustomChainConfig, IAdapter, WALLET_ADAPTER_TYPE } from "@web3auth/base";
+import { IBaseProvider } from "@web3auth/base-provider";
+export declare function getPrivateKeyProvider(chainConfig: CustomChainConfig): Promise<IBaseProvider<string>>;
 export declare const getDefaultAdapterModule: (params: {
     name: WALLET_ADAPTER_TYPE;
     clientId: string;

package/dist/types/utils.d.ts

@@ -7,5 +7,6 @@ export declare const languageMap: {
     es: string;
     fr: string;
     pt: string;
+    nl: string;
 };
 export declare const getUserLanguage: (defaultLanguage: string | undefined) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/modal",
-  "version": "5.2.0",
+  "version": "6.0.0-alpha.0",
   "homepage": "https://github.com/Web3Auth/Web3Auth#readme",
   "license": "ISC",
   "main": "dist/modal.cjs.js",
@@ -19,24 +19,27 @@
     "pre-commit": "lint-staged --cwd ."
   },
   "dependencies": {
-    "@web3auth/base": "^5.2.0",
-    "@web3auth/metamask-adapter": "^5.2.0",
-    "@web3auth/no-modal": "^5.2.0",
-    "@web3auth/openlogin-adapter": "^5.2.0",
-    "@web3auth/phantom-adapter": "^5.2.0",
-    "@web3auth/torus-evm-adapter": "^5.2.0",
-    "@web3auth/torus-solana-adapter": "^5.2.0",
-    "@web3auth/ui": "^5.2.0",
-    "@web3auth/wallet-connect-v1-adapter": "^5.2.0"
+    "@web3auth/base": "^6.0.0-alpha.0",
+    "@web3auth/base-provider": "^6.0.0-alpha.0",
+    "@web3auth/ethereum-provider": "^6.0.0-alpha.0",
+    "@web3auth/metamask-adapter": "^6.0.0-alpha.0",
+    "@web3auth/no-modal": "^6.0.0-alpha.0",
+    "@web3auth/openlogin-adapter": "^6.0.0-alpha.0",
+    "@web3auth/phantom-adapter": "^6.0.0-alpha.0",
+    "@web3auth/solana-provider": "^6.0.0-alpha.0",
+    "@web3auth/torus-evm-adapter": "^6.0.0-alpha.0",
+    "@web3auth/torus-solana-adapter": "^6.0.0-alpha.0",
+    "@web3auth/ui": "^6.0.0-alpha.0",
+    "@web3auth/wallet-connect-v2-adapter": "^6.0.0-alpha.0"
   },
   "devDependencies": {
-    "@svgr/webpack": "^6.5.1",
+    "@svgr/webpack": "^8.0.1",
     "@toruslabs/isomorphic-style-loader": "^5.3.3",
-    "@toruslabs/openlogin": "^3.2.1",
-    "css-loader": "^6.7.3",
+    "@toruslabs/openlogin-utils": "^4.5.1",
+    "css-loader": "^6.8.1",
     "postcss-prefix-selector": "^1.16.0",
-    "style-loader": "^3.3.2",
-    "tailwindcss": "^3.2.7",
+    "style-loader": "^3.3.3",
+    "tailwindcss": "^3.3.2",
     "url-loader": "^4.1.1"
   },
   "peerDependencies": {
@@ -64,5 +67,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6ccd82ba66c340dff977bf03f3d26cf7b267e01c"
+  "engines": {
+    "node": ">=16.18.1",
+    "npm": ">=8.x"
+  },
+  "gitHead": "c3f6ff688812333f37f10d8a6cf00be88aa451a1"
 }

package/src/config.ts

@@ -47,7 +47,7 @@ export const defaultEvmDappModalConfig: AdaptersModalConfig = {
       showOnMobile: true,
       showOnDesktop: true,
     },
-    [EVM_ADAPTERS.WALLET_CONNECT_V1]: {
+    [EVM_ADAPTERS.WALLET_CONNECT_V2]: {
       label: "Wallet Connect",
       showOnModal: true,
       showOnMobile: true,

package/src/default.ts

@@ -1,5 +1,21 @@
-import type { OPENLOGIN_NETWORK_TYPE, OpenLoginOptions } from "@toruslabs/openlogin";
+import type { OPENLOGIN_NETWORK_TYPE, OpenLoginOptions } from "@toruslabs/openlogin-utils";
 import { CHAIN_NAMESPACES, CustomChainConfig, getChainConfig, IAdapter, WALLET_ADAPTER_TYPE, WALLET_ADAPTERS } from "@web3auth/base";
+import { CommonPrivateKeyProvider, IBaseProvider } from "@web3auth/base-provider";
+
+export async function getPrivateKeyProvider(chainConfig: CustomChainConfig): Promise<IBaseProvider<string>> {
+  if (chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+    const { SolanaPrivateKeyProvider } = await import("@web3auth/solana-provider");
+    return new SolanaPrivateKeyProvider({ config: { chainConfig } });
+  } else if (chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
+    const { EthereumPrivateKeyProvider } = await import("@web3auth/ethereum-provider");
+    return new EthereumPrivateKeyProvider({ config: { chainConfig } });
+  } else if (chainConfig.chainNamespace === CHAIN_NAMESPACES.OTHER) {
+    // Modal doesn't support ripple provider
+    // Can always override this with a custom provider
+    return new CommonPrivateKeyProvider();
+  }
+  throw new Error(`Invalid chainNamespace: ${chainConfig.chainNamespace} found while connecting to wallet`);
+}
 
 // warning: this function is not compatible with "OTHER" chain namespace.
 export const getDefaultAdapterModule = async (params: {
@@ -32,12 +48,26 @@ export const getDefaultAdapterModule = async (params: {
     const { PhantomAdapter } = await import("@web3auth/phantom-adapter");
     const adapter = new PhantomAdapter({ chainConfig: finalChainConfig, clientId, sessionTime, web3AuthNetwork });
     return adapter;
-  } else if (name === WALLET_ADAPTERS.WALLET_CONNECT_V1) {
-    const { WalletConnectV1Adapter } = await import("@web3auth/wallet-connect-v1-adapter");
-    const adapter = new WalletConnectV1Adapter({ chainConfig: finalChainConfig, clientId, sessionTime, web3AuthNetwork });
+  } else if (name === WALLET_ADAPTERS.WALLET_CONNECT_V2) {
+    const { WalletConnectV2Adapter } = await import("@web3auth/wallet-connect-v2-adapter");
+    const adapter = new WalletConnectV2Adapter({
+      chainConfig: finalChainConfig,
+      clientId,
+      sessionTime,
+      web3AuthNetwork,
+      adapterSettings: {
+        walletConnectInitOptions: {
+          // Using a default wallet connect project id for web3auth modal integration
+          projectId: "d3c63f19f9582f8ba48e982057eb096b",
+        },
+      },
+    });
     return adapter;
   } else if (name === WALLET_ADAPTERS.OPENLOGIN) {
     const { OpenloginAdapter, getOpenloginDefaultOptions } = await import("@web3auth/openlogin-adapter");
+
+    const privateKeyProvider: IBaseProvider<string> = await getPrivateKeyProvider(finalChainConfig);
+
     const defaultOptions = getOpenloginDefaultOptions();
     const adapter = new OpenloginAdapter({
       ...defaultOptions,
@@ -46,6 +76,7 @@ export const getDefaultAdapterModule = async (params: {
       adapterSettings: { ...(defaultOptions.adapterSettings as OpenLoginOptions), clientId, network: web3AuthNetwork },
       sessionTime,
       web3AuthNetwork,
+      privateKeyProvider,
     });
     return adapter;
   }

package/src/modalManager.ts

@@ -12,7 +12,9 @@ import {
   WALLET_ADAPTER_TYPE,
   WALLET_ADAPTERS,
 } from "@web3auth/base";
+import { CommonJRPCProvider } from "@web3auth/base-provider";
 import { Web3AuthNoModal, Web3AuthNoModalOptions } from "@web3auth/no-modal";
+import type { OpenloginAdapter } from "@web3auth/openlogin-adapter";
 import { getAdapterSocialLogins, LOGIN_MODAL_EVENTS, LoginModal, OPENLOGIN_PROVIDERS, UIConfig } from "@web3auth/ui";
 
 import {
@@ -22,7 +24,7 @@ import {
   defaultSolanaDappModalConfig,
   defaultSolanaWalletModalConfig,
 } from "./config";
-import { getDefaultAdapterModule } from "./default";
+import { getDefaultAdapterModule, getPrivateKeyProvider } from "./default";
 import { AdaptersModalConfig, IWeb3AuthModal, ModalConfig } from "./interface";
 import { getUserLanguage } from "./utils";
 
@@ -154,6 +156,14 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           this.walletAdapters[adapterName].setAdapterSettings({ chainConfig });
         }
 
+        if (adapterName === WALLET_ADAPTERS.OPENLOGIN) {
+          const openloginAdapter = this.walletAdapters[adapterName] as OpenloginAdapter;
+          if (!openloginAdapter.privateKeyProvider) {
+            const currentPrivateKeyProvider = await getPrivateKeyProvider(openloginAdapter.chainConfigProxy as CustomChainConfig);
+            openloginAdapter.setAdapterSettings({ privateKeyProvider: currentPrivateKeyProvider });
+          }
+        }
+
         return adapterName;
       }
     });
@@ -202,6 +212,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       }
     });
 
+    this.commonJRPCProvider = await CommonJRPCProvider.getProviderInstance({ chainConfig: this.coreOptions.chainConfig as CustomChainConfig });
     this.status = ADAPTER_STATUS.READY;
     await Promise.all(initPromises);
 
@@ -224,7 +235,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
   public async connect(): Promise<SafeEventEmitterProvider | null> {
     // if (!this.loginModal.initialized) throw new Error("Login modal is not initialized");
     // if already connected return provider
-    if (this.provider) return this.provider;
+    if (this.connectedAdapterName && this.status === ADAPTER_STATUS.CONNECTED && this.provider) return this.provider;
     this.loginModal.open();
     return new Promise((resolve, reject) => {
       this.once(ADAPTER_EVENTS.CONNECTED, () => {

package/src/utils.ts

@@ -11,6 +11,7 @@ export const languageMap = {
   es: "spanish",
   fr: "french",
   pt: "portuguese",
+  nl: "dutch",
 };
 
 export const getUserLanguage = (defaultLanguage: string | undefined) => {