fix: catch and throw weerror previously handled by ethereumjs-wallet

MetaMask · Jun 10, 2024 · 6bb7c94 · 6bb7c94
1 parent 0f986ad
commit 6bb7c94
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts
@@ -1005,17 +1005,21 @@ export class KeyringController extends BaseController<
           privateKey = remove0x(prefixed);
           break;
         case 'json': {
-          const getWallet = async (): Promise<Wallet> => {
-            const [input, password] = args;
-            try {
-              return importers.fromEtherWallet(input, password);
-            } catch (e) {
-              return Wallet.fromV3(input, password, true);
-            }
-          };
-          const wallet = await getWallet();
-          privateKey = bytesToHex(wallet.getPrivateKey());
-          break;
+          try {
+            const getWallet = async (): Promise<Wallet> => {
+              const [input, password] = args;
+              try {
+                return importers.fromEtherWallet(input, password);
+              } catch (e) {
+                return Wallet.fromV3(input, password, true);
+              }
+            };
+            const wallet = await getWallet();
+            privateKey = bytesToHex(wallet.getPrivateKey());
+            break;
+          } catch(e) {
+            throw new Error('Key derivation failed - possibly wrong passphrase');
+          }
         }
         default:
           throw new Error(`Unexpected import strategy: '${strategy}'`);