fix: wallet privatekey import fix-n

MetaMask · Apr 18, 2024 · 3736bba · 3736bba
1 parent 346de6a
commit 3736bba
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts
@@ -1055,13 +1055,15 @@ export class KeyringController extends BaseController<
         privateKey = remove0x(prefixed);
         break;
       case 'json':
-        let wallet;
         const [input, password] = args;
-        try {
-          wallet = importers.fromEtherWallet(input, password);
-        } catch (e) {
-          wallet = wallet || (await Wallet.fromV3(input, password, true));
-        }
+        const getWallet = async () => {
+          try {
+            return await importers.fromEtherWallet(input, password);
+          } catch (e) {
+            return await Wallet.fromV3(input, password, true);
+          }
+        };
+        const wallet: Wallet = await getWallet();
         privateKey = bytesToHex(wallet.getPrivateKey());
         break;
       default: