error refactoring

Web3Auth · Jul 3, 2024 · 5978975 · 5978975
1 parent dbfeb2b
commit 5978975
Show file tree

Hide file tree

Showing 35 changed files with 302 additions and 416 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,17 +42,17 @@
     "husky": "^9.0.11",
     "lerna": "^8.1.5",
     "lint-staged": "^15.2.7",
-    "mocha": "^10.5.1",
+    "mocha": "^10.6.0",
     "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "tslib": "^2.6.3",
-    "typescript": "^5.5.2"
+    "typescript": "^5.5.3"
   },
   "optionalDependencies": {
-    "@nx/nx-linux-x64-gnu": "^19.3.1",
+    "@nx/nx-linux-x64-gnu": "^19.4.0",
     "@rollup/rollup-linux-x64-gnu": "^4.18.0"
   },
   "repository": {

diff --git a/packages/adapters/base-evm-adapter/package.json b/packages/adapters/base-evm-adapter/package.json
@@ -19,7 +19,7 @@
     "pre-commit": "lint-staged --cwd ."
   },
   "dependencies": {
-    "@toruslabs/base-controllers": "^5.9.0",
+    "@toruslabs/base-controllers": "^5.9.2",
     "@web3auth/base": "^8.7.0"
   },
   "files": [

diff --git a/packages/adapters/base-solana-adapter/package.json b/packages/adapters/base-solana-adapter/package.json
@@ -19,7 +19,7 @@
     "pre-commit": "lint-staged --cwd ."
   },
   "dependencies": {
-    "@toruslabs/base-controllers": "^5.9.0",
+    "@toruslabs/base-controllers": "^5.9.2",
     "@web3auth/base": "^8.7.0",
     "bs58": "^5.0.0"
   },

diff --git a/packages/adapters/coinbase-adapter/src/coinbaseAdapter.ts b/packages/adapters/coinbase-adapter/src/coinbaseAdapter.ts
@@ -115,7 +115,7 @@ class CoinbaseAdapter extends BaseEvmAdapter<void> {
       this.rehydrated = false;
       this.emit(ADAPTER_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
-      throw WalletLoginError.connectionError("Failed to login with coinbase wallet");
+      throw WalletLoginError.connectionError("Failed to login with coinbase wallet", error);
     }
   }
 

diff --git a/packages/adapters/default-evm-adapter/src/index.ts b/packages/adapters/default-evm-adapter/src/index.ts
@@ -1,9 +1,10 @@
-import { CHAIN_NAMESPACES, CustomChainConfig, getChainConfig, IAdapter, IWeb3AuthCoreOptions } from "@web3auth/base";
+import { CHAIN_NAMESPACES, CustomChainConfig, getChainConfig, IAdapter, IWeb3AuthCoreOptions, WalletInitializationError } from "@web3auth/base";
 
 export const getDefaultExternalAdapters = async (params: { options: IWeb3AuthCoreOptions }): Promise<IAdapter<unknown>[]> => {
   const { options } = params;
   const { clientId, chainConfig, sessionTime, web3AuthNetwork, useCoreKitKey } = options;
-  if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace)) throw new Error(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
+  if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace))
+    throw WalletInitializationError.invalidParams(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
   const finalChainConfig = {
     ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId) as CustomChainConfig),
     ...(chainConfig || {}),

diff --git a/packages/adapters/default-solana-adapter/src/index.ts b/packages/adapters/default-solana-adapter/src/index.ts
@@ -1,9 +1,10 @@
-import { CHAIN_NAMESPACES, CustomChainConfig, getChainConfig, IAdapter, IWeb3AuthCoreOptions } from "@web3auth/base";
+import { CHAIN_NAMESPACES, CustomChainConfig, getChainConfig, IAdapter, IWeb3AuthCoreOptions, WalletInitializationError } from "@web3auth/base";
 
 export const getDefaultExternalAdapters = async (params: { options: IWeb3AuthCoreOptions }): Promise<IAdapter<unknown>[]> => {
   const { options } = params;
   const { clientId, chainConfig, sessionTime, web3AuthNetwork, useCoreKitKey } = options;
-  if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace)) throw new Error(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
+  if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace))
+    throw WalletInitializationError.invalidParams(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
   const finalChainConfig = {
     ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId) as CustomChainConfig),
     ...(chainConfig || {}),

diff --git a/packages/adapters/metamask-adapter/src/metamaskAdapter.ts b/packages/adapters/metamask-adapter/src/metamaskAdapter.ts
@@ -125,7 +125,7 @@ class MetamaskAdapter extends BaseEvmAdapter<void> {
       this.rehydrated = false;
       this.emit(ADAPTER_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
-      throw WalletLoginError.connectionError("Failed to login with metamask wallet");
+      throw WalletLoginError.connectionError("Failed to login with metamask wallet", error);
     }
   }
 

diff --git a/packages/adapters/openlogin-adapter/src/openloginAdapter.ts b/packages/adapters/openlogin-adapter/src/openloginAdapter.ts
@@ -139,7 +139,7 @@ export class OpenloginAdapter extends BaseAdapter<OpenloginLoginParams> {
       } else if (error instanceof Web3AuthError) {
         throw error;
       }
-      throw WalletLoginError.connectionError("Failed to login with openlogin");
+      throw WalletLoginError.connectionError("Failed to login with openlogin", error);
     }
   }
 
@@ -153,7 +153,7 @@ export class OpenloginAdapter extends BaseAdapter<OpenloginLoginParams> {
       if (error instanceof Web3AuthError) {
         throw error;
       }
-      throw WalletLoginError.connectionError((error as Error).message || "Failed to enable MFA with openlogin");
+      throw WalletLoginError.connectionError("Failed to enable MFA with openlogin", error);
     }
   }
 

diff --git a/packages/adapters/phantom-adapter/src/phantomAdapter.ts b/packages/adapters/phantom-adapter/src/phantomAdapter.ts
@@ -109,7 +109,7 @@ export class PhantomAdapter extends BaseSolanaAdapter<void> {
           });
         } catch (error: unknown) {
           if (error instanceof Web3AuthError) throw error;
-          throw WalletLoginError.connectionError((error as Error)?.message);
+          throw WalletLoginError.connectionError((error as Error)?.message, error);
         } finally {
           this._wallet._handleDisconnect = handleDisconnect;
         }

diff --git a/packages/adapters/slope-adapter/src/slopeAdapter.ts b/packages/adapters/slope-adapter/src/slopeAdapter.ts
@@ -91,7 +91,7 @@ export class SlopeAdapter extends BaseSolanaAdapter<void> {
         await this.connectWithProvider(this._wallet);
       } catch (error: unknown) {
         if (error instanceof Web3AuthError) throw error;
-        throw WalletLoginError.connectionError((error as Error)?.message);
+        throw WalletLoginError.connectionError((error as Error)?.message, error);
       }
 
       return this.provider;

diff --git a/packages/adapters/solflare-adapter/package.json b/packages/adapters/solflare-adapter/package.json
@@ -44,7 +44,7 @@
     "bn.js": "^5.2.1"
   },
   "devDependencies": {
-    "@solana/web3.js": "^1.93.2",
+    "@solana/web3.js": "^1.94.0",
     "@solflare-wallet/sdk": "^1.4.2"
   },
   "lint-staged": {

diff --git a/packages/adapters/solflare-adapter/src/solflareAdapter.ts b/packages/adapters/solflare-adapter/src/solflareAdapter.ts
@@ -96,7 +96,7 @@ export class SolflareAdapter extends BaseSolanaAdapter<void> {
           await wallet.connect();
         } catch (error: unknown) {
           if (error instanceof Web3AuthError) throw error;
-          throw WalletLoginError.connectionError((error as Error)?.message);
+          throw WalletLoginError.connectionError((error as Error)?.message, error);
         }
       }
       await this.connectWithProvider(wallet as SolflareWallet);

diff --git a/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts b/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts
@@ -144,7 +144,7 @@ export class TorusWalletAdapter extends BaseEvmAdapter<never> {
       this.status = ADAPTER_STATUS.READY;
       this.rehydrated = false;
       this.emit(ADAPTER_STATUS.ERRORED, error);
-      throw error instanceof Web3AuthError ? error : WalletLoginError.connectionError("Failed to login with torus wallet");
+      throw error instanceof Web3AuthError ? error : WalletLoginError.connectionError("Failed to login with torus wallet", error);
     }
   }
 

diff --git a/packages/adapters/torus-solana-adapter/src/solanaWalletAdapter.ts b/packages/adapters/torus-solana-adapter/src/solanaWalletAdapter.ts
@@ -139,7 +139,7 @@ export class SolanaWalletAdapter extends BaseSolanaAdapter<void> {
       this.rehydrated = false;
       this.emit(ADAPTER_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
-      throw WalletLoginError.connectionError("Failed to login with torus solana wallet");
+      throw WalletLoginError.connectionError("Failed to login with torus solana wallet", error);
     }
   }
 

diff --git a/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2Utils.ts b/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2Utils.ts
@@ -3,6 +3,7 @@ import { providerErrors, rpcErrors } from "@metamask/rpc-errors";
 import type { JRPCRequest } from "@toruslabs/openlogin-jrpc";
 import type { ISignClient, SessionTypes } from "@walletconnect/types";
 import { getAccountsFromNamespaces, parseAccountId } from "@walletconnect/utils";
+import { WalletLoginError } from "@web3auth/base";
 import type { AddEthereumChainParameter, IProviderHandlers, MessageParams, TransactionParams, TypedMessageParams } from "@web3auth/ethereum-provider";
 
 async function getLastActiveSession(signClient: ISignClient): Promise<SessionTypes.Struct | null> {
@@ -43,7 +44,7 @@ export async function getAccounts(signClient: ISignClient): Promise<string[]> {
       ),
     ];
   }
-  throw new Error("Failed to get accounts");
+  throw WalletLoginError.connectionError("Failed to get accounts");
 }
 
 export function getProviderHandlers({ connector, chainId }: { connector: ISignClient; chainId: number }): IProviderHandlers {

diff --git a/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts b/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts
@@ -146,7 +146,7 @@ class WalletConnectV2Adapter extends BaseEvmAdapter<void> {
       const finalError =
         error instanceof Web3AuthError
           ? error
-          : WalletLoginError.connectionError(`Failed to login with wallet connect: ${(error as Error)?.message || ""}`);
+          : WalletLoginError.connectionError(`Failed to login with wallet connect: ${(error as Error)?.message || ""}`, error);
       throw finalError;
     }
   }

diff --git a/packages/base/src/chain/config.ts b/packages/base/src/chain/config.ts
@@ -1,3 +1,4 @@
+import { WalletInitializationError } from "../errors";
 import { CHAIN_NAMESPACES, ChainNamespaceType, CustomChainConfig } from "./IChainInterface";
 const getDefaultNetworkId = (chainNamespace: ChainNamespaceType): number => {
   if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
@@ -7,7 +8,7 @@ const getDefaultNetworkId = (chainNamespace: ChainNamespaceType): number => {
   } else if (chainNamespace === CHAIN_NAMESPACES.XRPL) {
     return 1;
   }
-  throw new Error(`Chain namespace ${chainNamespace} is not supported`);
+  throw WalletInitializationError.invalidParams(`Chain namespace ${chainNamespace} is not supported`);
 };
 
 export const getEvmChainConfig = (chainId: number): CustomChainConfig | null => {