fix: wallet privatekey import fix

MetaMask · Apr 25, 2024 · 39a92d8 · 39a92d8
1 parent fb65c22
commit 39a92d8
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts
@@ -941,15 +941,19 @@ 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 (): 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;
+        }
         default:
           throw new Error(`Unexpected import strategy: '${strategy}'`);
       }