@web3auth/no-modal 6.1.7 → 7.0.0-beta.0

package/dist/types/noModal.d.ts

@@ -1,6 +1,6 @@
 import { SafeEventEmitter } from "@toruslabs/openlogin-jrpc";
 import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin-utils";
-import { ADAPTER_STATUS_TYPE, CustomChainConfig, IAdapter, IWeb3Auth, SafeEventEmitterProvider, UserAuthInfo, UserInfo, WALLET_ADAPTER_TYPE } from "@web3auth/base";
+import { ADAPTER_STATUS_TYPE, CustomChainConfig, IAdapter, IProvider, IWeb3Auth, UserAuthInfo, UserInfo, WALLET_ADAPTER_TYPE } from "@web3auth/base";
 import { IPlugin } from "@web3auth/base-plugin";
 import { CommonJRPCProvider } from "@web3auth/base-provider";
 export interface Web3AuthNoModalOptions {
@@ -57,8 +57,8 @@ export declare class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Au
     private storage;
     constructor(options: Web3AuthNoModalOptions);
     get connected(): boolean;
-    get provider(): SafeEventEmitterProvider | null;
-    set provider(_: SafeEventEmitterProvider | null);
+    get provider(): IProvider | null;
+    set provider(_: IProvider | null);
     init(): Promise<void>;
     configureAdapter(adapter: IAdapter<unknown>): Web3AuthNoModal;
     clearCache(): void;
@@ -70,7 +70,7 @@ export declare class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Au
      * Connect to a specific wallet adapter
      * @param walletName - Key of the walletAdapter to use.
      */
-    connectTo<T>(walletName: WALLET_ADAPTER_TYPE, loginParams?: T): Promise<SafeEventEmitterProvider | null>;
+    connectTo<T>(walletName: WALLET_ADAPTER_TYPE, loginParams?: T): Promise<IProvider | null>;
     logout(options?: {
         cleanup: boolean;
     }): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "6.1.7",
+  "version": "7.0.0-beta.0",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -35,12 +35,12 @@
     "@babel/runtime": "^7.x"
   },
   "dependencies": {
-    "@toruslabs/openlogin": "^4.7.2",
-    "@toruslabs/openlogin-jrpc": "^4.7.2",
-    "@toruslabs/openlogin-utils": "^4.7.0",
-    "@web3auth/base": "^6.1.7",
-    "@web3auth/base-plugin": "^6.1.7",
-    "@web3auth/base-provider": "^6.1.7"
+    "@toruslabs/openlogin": "^5.0.3",
+    "@toruslabs/openlogin-jrpc": "^5.0.2",
+    "@toruslabs/openlogin-utils": "^5.0.2",
+    "@web3auth/base": "^7.0.0-beta.0",
+    "@web3auth/base-plugin": "^7.0.0-beta.0",
+    "@web3auth/base-provider": "^7.0.0-beta.0"
   },
   "lint-staged": {
     "!(*d).ts": [
@@ -59,8 +59,8 @@
     "url": "https://github.com/Web3Auth/Web3Auth/issues"
   },
   "engines": {
-    "node": ">=16.18.1",
-    "npm": ">=8.x"
+    "node": ">=18.x",
+    "npm": ">=9.x"
   },
-  "gitHead": "7e8cd73670babae1b3105886d7bfa54da6392cf0"
+  "gitHead": "3555b328ece2c5f3b97be93f6ff7ddecb322535a"
 }

package/src/noModal.ts

@@ -10,14 +10,14 @@ import {
   CustomChainConfig,
   getChainConfig,
   IAdapter,
+  IBaseProvider,
+  IProvider,
   IWeb3Auth,
   log,
-  SafeEventEmitterProvider,
   storageAvailable,
   UserAuthInfo,
   UserInfo,
   WALLET_ADAPTER_TYPE,
-  WALLET_ADAPTERS,
   WalletInitializationError,
   WalletLoginError,
   Web3AuthError,
@@ -114,14 +114,14 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
     return Boolean(this.connectedAdapterName);
   }
 
-  get provider(): SafeEventEmitterProvider | null {
+  get provider(): IProvider | null {
     if (this.status !== ADAPTER_STATUS.NOT_READY && this.commonJRPCProvider) {
-      return this.commonJRPCProvider.provider;
+      return this.commonJRPCProvider;
     }
     return null;
   }
 
-  set provider(_: SafeEventEmitterProvider | null) {
+  set provider(_: IProvider | null) {
     throw new Error("Not implemented");
   }
 
@@ -169,17 +169,6 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
         `This wallet adapter belongs to ${adapter.adapterNamespace} which is incompatible with currently used namespace: ${providedChainConfig.chainNamespace}`
       );
 
-    if (adapter.name === WALLET_ADAPTERS.WALLET_CONNECT_V2 && this.walletAdapters[WALLET_ADAPTERS.WALLET_CONNECT_V1]) {
-      throw WalletInitializationError.invalidParams(
-        "Either one of wallet connect v2 or wallet connect v1 can be used, wallet connect v1 is already added to adapter lists."
-      );
-    }
-    if (adapter.name === WALLET_ADAPTERS.WALLET_CONNECT_V1 && this.walletAdapters[WALLET_ADAPTERS.WALLET_CONNECT_V2]) {
-      throw WalletInitializationError.invalidParams(
-        "Either one of wallet connect v2 or wallet connect v1 can be used, wallet connect v2 is already added to adapter lists."
-      );
-    }
-
     if (
       adapter.adapterNamespace === ADAPTER_NAMESPACES.MULTICHAIN &&
       adapter.currentChainNamespace &&
@@ -223,11 +212,11 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
    * Connect to a specific wallet adapter
    * @param walletName - Key of the walletAdapter to use.
    */
-  async connectTo<T>(walletName: WALLET_ADAPTER_TYPE, loginParams?: T): Promise<SafeEventEmitterProvider | null> {
+  async connectTo<T>(walletName: WALLET_ADAPTER_TYPE, loginParams?: T): Promise<IProvider | null> {
     if (!this.walletAdapters[walletName] || !this.commonJRPCProvider)
       throw WalletInitializationError.notFound(`Please add wallet adapter for ${walletName} wallet, before connecting`);
     const provider = await this.walletAdapters[walletName].connect(loginParams);
-    this.commonJRPCProvider.updateProviderEngineProxy(provider as SafeEventEmitterProvider);
+    this.commonJRPCProvider.updateProviderEngineProxy((provider as IBaseProvider<unknown>).provider || provider);
     return this.provider;
   }
 
@@ -262,7 +251,7 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
     walletAdapter.on(ADAPTER_EVENTS.CONNECTED, async (data: CONNECTED_EVENT_DATA) => {
       if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
       const { provider } = this.walletAdapters[data.adapter];
-      this.commonJRPCProvider.updateProviderEngineProxy(provider as SafeEventEmitterProvider);
+      this.commonJRPCProvider.updateProviderEngineProxy((provider as IBaseProvider<unknown>).provider || provider);
       this.status = ADAPTER_STATUS.CONNECTED;
       this.connectedAdapterName = data.adapter;
       this.cacheWallet(data.adapter);