Merge branch 'feat/one-package' of github.com:Web3Auth/web3auth-web; branch 'master' of github.com:Web3Auth/Web3Auth into feat/one-package

Author: arch1995

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "9.5.3",
+  "version": "9.5.4",
   "npmClient": "npm"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/modal",
-  "version": "9.5.2",
+  "version": "9.5.4",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/ui",
@@ -55,7 +55,7 @@
   "dependencies": {
     "@toruslabs/http-helpers": "^7.0.0",
     "@web3auth/auth": "^9.6.4",
-    "@web3auth/no-modal": "^9.5.3",
+    "@web3auth/no-modal": "^9.5.4",
     "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": "9.5.3",
+  "version": "9.5.4",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/no-modal",

packages/no-modal/package.json

@@ -72,6 +72,7 @@ class InjectedEvmAdapter extends BaseEvmAdapter<void> {
   async connect(): Promise<IProvider | null> {
     super.checkConnectionRequirements();
     if (!this.injectedProvider) throw WalletLoginError.connectionError("Injected provider is not available");
+    if (!this.chainConfig) throw WalletLoginError.connectionError("Chain config is not available");
     this.status = ADAPTER_STATUS.CONNECTING;
     this.emit(ADAPTER_EVENTS.CONNECTING, { adapter: this.name });
     try {
@@ -86,15 +87,10 @@ class InjectedEvmAdapter extends BaseEvmAdapter<void> {
         }
       }
       this.status = ADAPTER_STATUS.CONNECTED;
-      const chainDisconnectHandler = () => {
-        this.disconnect();
-        if (this.injectedProvider.removeListener) this.injectedProvider.removeListener("disconnect", chainDisconnectHandler);
-      };
-      this.injectedProvider.on("disconnect", chainDisconnectHandler);
       const accountDisconnectHandler = (accounts: string[]) => {
         if (accounts.length === 0) {
           this.disconnect();
-          if (this.injectedProvider.removeListener) this.injectedProvider.removeListener("accountsChanged", accountDisconnectHandler);
+          if (this.injectedProvider?.removeListener) this.injectedProvider.removeListener("accountsChanged", accountDisconnectHandler);
         }
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
@@ -115,8 +111,9 @@ class InjectedEvmAdapter extends BaseEvmAdapter<void> {
   }
 
   async disconnect(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
+    if (!this.injectedProvider) throw WalletLoginError.connectionError("Injected provider is not available");
     await super.disconnectSession();
-    if (typeof this.injectedProvider?.removeAllListeners !== "undefined") this.injectedProvider?.removeAllListeners();
+    if (typeof this.injectedProvider.removeAllListeners !== "undefined") this.injectedProvider.removeAllListeners();
     try {
       await this.injectedProvider.request({
         method: "wallet_revokePermissions",
@@ -139,8 +136,9 @@ class InjectedEvmAdapter extends BaseEvmAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
+    if (!this.injectedProvider) throw WalletLoginError.connectionError("Injected provider is not available");
     super.checkAddChainRequirements(chainConfig, init);
-    await this.injectedProvider?.request({
+    await this.injectedProvider.request({
       method: "wallet_addEthereumChain",
       params: [
         {
@@ -161,8 +159,9 @@ class InjectedEvmAdapter extends BaseEvmAdapter<void> {
   }
 
   public async switchChain(params: { chainId: string }, init = false): Promise<void> {
+    if (!this.injectedProvider) throw WalletLoginError.connectionError("Injected provider is not available");
     super.checkSwitchChainRequirements(params, init);
-    await this.injectedProvider?.request({
+    await this.injectedProvider.request({
       method: "wallet_switchEthereumChain",
       params: [{ chainId: params.chainId }],
     });

packages/no-modal/src/adapters/default-evm-adapter/injectedEvmAdapter.ts

@@ -61,7 +61,7 @@ export async function createAaMiddleware({
     if (!handlers.getPrivateKey) {
       throw rpcErrors.methodNotSupported();
     }
-    res.result = handlers.getPrivateKey(req);
+    res.result = await handlers.getPrivateKey(req);
   }
 
   async function sendTransaction(req: JRPCRequest<TransactionParams>, res: JRPCResponse<unknown>): Promise<void> {
@@ -163,12 +163,21 @@ export async function createAaMiddleware({
     res.result = await handlers.processPersonalMessage(msgParams, req);
   }
 
+  async function fetchPublicKey(req: JRPCRequest<unknown>, res: JRPCResponse<unknown>): Promise<void> {
+    if (!handlers.getPublicKey) {
+      throw rpcErrors.methodNotSupported();
+    }
+    res.result = await handlers.getPublicKey(req);
+  }
+
   return createScaffoldMiddleware({
     // account lookups
     eth_accounts: createAsyncMiddleware(lookupAccounts),
     eth_requestAccounts: createAsyncMiddleware(lookupAccounts),
     eth_private_key: createAsyncMiddleware(fetchPrivateKey),
     private_key: createAsyncMiddleware(fetchPrivateKey),
+    eth_public_key: createAsyncMiddleware(fetchPublicKey),
+    public_key: createAsyncMiddleware(fetchPublicKey),
     // tx signatures
     eth_sendTransaction: createAsyncMiddleware(sendTransaction),
     eth_signTransaction: createAsyncMiddleware(signTransaction),

packages/no-modal/src/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.ts

@@ -170,14 +170,14 @@ export function createWalletMiddleware({
     if (!getPrivateKey) {
       throw rpcErrors.methodNotSupported();
     }
-    res.result = getPrivateKey(req);
+    res.result = await getPrivateKey(req);
   }
 
   async function fetchPublicKey(req: JRPCRequest<unknown>, res: JRPCResponse<unknown>): Promise<void> {
     if (!getPublicKey) {
       throw rpcErrors.methodNotSupported();
     }
-    res.result = getPublicKey(req);
+    res.result = await getPublicKey(req);
   }
 
   return createScaffoldMiddleware({