@web3auth/no-modal 5.2.0 → 6.0.1-alpha.0

package/dist/types/noModal.d.ts

@@ -1,7 +1,8 @@
-import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin";
 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 { IPlugin } from "@web3auth/base-plugin";
+import { CommonJRPCProvider } from "@web3auth/base-provider";
 export interface Web3AuthNoModalOptions {
     /**
      * Client id for web3auth.
@@ -51,9 +52,11 @@ export declare class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Au
     status: ADAPTER_STATUS_TYPE;
     cachedAdapter: string | null;
     protected walletAdapters: Record<string, IAdapter<unknown>>;
+    protected commonJRPCProvider: CommonJRPCProvider | null;
     private plugins;
     private storage;
     constructor(options: Web3AuthNoModalOptions);
+    get connected(): boolean;
     get provider(): SafeEventEmitterProvider | null;
     set provider(_: SafeEventEmitterProvider | null);
     init(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/no-modal",
-  "version": "5.2.0",
+  "version": "6.0.1-alpha.0",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",
@@ -35,10 +35,12 @@
     "@babel/runtime": "^7.x"
   },
   "dependencies": {
-    "@toruslabs/openlogin": "^3.2.1",
-    "@toruslabs/openlogin-jrpc": "^3.2.0",
-    "@web3auth/base": "^5.2.0",
-    "@web3auth/base-plugin": "^5.2.0"
+    "@toruslabs/openlogin": "^4.5.3",
+    "@toruslabs/openlogin-jrpc": "^4.5.1",
+    "@toruslabs/openlogin-utils": "^4.5.1",
+    "@web3auth/base": "^6.0.1-alpha.0",
+    "@web3auth/base-plugin": "^6.0.1-alpha.0",
+    "@web3auth/base-provider": "^6.0.1-alpha.0"
   },
   "lint-staged": {
     "!(*d).ts": [
@@ -56,5 +58,9 @@
   "bugs": {
     "url": "https://github.com/Web3Auth/Web3Auth/issues"
   },
-  "gitHead": "6ccd82ba66c340dff977bf03f3d26cf7b267e01c"
+  "engines": {
+    "node": ">=16.18.1",
+    "npm": ">=8.x"
+  },
+  "gitHead": "82b8c037c89a38d88bccef48b8597d0967f1539a"
 }

package/src/noModal.ts

@@ -1,5 +1,5 @@
-import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin";
 import { SafeEventEmitter } from "@toruslabs/openlogin-jrpc";
+import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin-utils";
 import {
   ADAPTER_EVENTS,
   ADAPTER_NAMESPACES,
@@ -23,6 +23,7 @@ import {
   Web3AuthError,
 } from "@web3auth/base";
 import { IPlugin, PLUGIN_NAMESPACES } from "@web3auth/base-plugin";
+import { CommonJRPCProvider } from "@web3auth/base-provider";
 
 export interface Web3AuthNoModalOptions {
   /**
@@ -83,6 +84,8 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
 
   protected walletAdapters: Record<string, IAdapter<unknown>> = {};
 
+  protected commonJRPCProvider: CommonJRPCProvider | null = null;
+
   private plugins: Record<string, IPlugin> = {};
 
   private storage: "sessionStorage" | "localStorage" = "localStorage";
@@ -107,10 +110,13 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
     this.subscribeToAdapterEvents = this.subscribeToAdapterEvents.bind(this);
   }
 
+  get connected(): boolean {
+    return Boolean(this.connectedAdapterName);
+  }
+
   get provider(): SafeEventEmitterProvider | null {
-    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName) {
-      const adapter = this.walletAdapters[this.connectedAdapterName];
-      return adapter.provider;
+    if (this.status !== ADAPTER_STATUS.NOT_READY && this.commonJRPCProvider) {
+      return this.commonJRPCProvider.provider;
     }
     return null;
   }
@@ -145,6 +151,7 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
 
       return this.walletAdapters[adapterName].init({ autoConnect: this.cachedAdapter === adapterName }).catch((e) => log.error(e));
     });
+    this.commonJRPCProvider = await CommonJRPCProvider.getProviderInstance({ chainConfig: this.coreOptions.chainConfig as CustomChainConfig });
     this.status = ADAPTER_STATUS.READY;
     await Promise.all(initPromises);
   }
@@ -193,13 +200,23 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
   }
 
   public async addChain(chainConfig: CustomChainConfig): Promise<void> {
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    return this.walletAdapters[this.connectedAdapterName].addChain(chainConfig);
+    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName)
+      return this.walletAdapters[this.connectedAdapterName].addChain(chainConfig);
+
+    if (this.commonJRPCProvider) {
+      return this.commonJRPCProvider.addChain(chainConfig);
+    }
+    throw WalletInitializationError.notReady(`No wallet is ready`);
   }
 
   public async switchChain(params: { chainId: string }): Promise<void> {
-    if (this.status !== ADAPTER_STATUS.CONNECTED || !this.connectedAdapterName) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    return this.walletAdapters[this.connectedAdapterName].switchChain(params);
+    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName)
+      return this.walletAdapters[this.connectedAdapterName].switchChain(params);
+
+    if (this.commonJRPCProvider) {
+      return this.commonJRPCProvider.switchChain(params);
+    }
+    throw WalletInitializationError.notReady(`No wallet is connected`);
   }
 
   /**
@@ -207,10 +224,11 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
    * @param walletName - Key of the walletAdapter to use.
    */
   async connectTo<T>(walletName: WALLET_ADAPTER_TYPE, loginParams?: T): Promise<SafeEventEmitterProvider | null> {
-    if (!this.walletAdapters[walletName])
+    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);
-    return provider;
+    this.commonJRPCProvider.updateProviderEngineProxy(provider as SafeEventEmitterProvider);
+    return this.provider;
   }
 
   async logout(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
@@ -242,6 +260,9 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
 
   protected subscribeToAdapterEvents(walletAdapter: IAdapter<unknown>): void {
     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.status = ADAPTER_STATUS.CONNECTED;
       this.connectedAdapterName = data.adapter;
       this.cacheWallet(data.adapter);