@metamask-previews/keyring-controller 25.0.0-preview-db01d69 → 25.0.0-preview-f557eade

package/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added new `KeyringBuilder` type ([#7334](https://github.com/MetaMask/core/pull/7334))
 - Added an action to call `removeAccount` ([#7241](https://github.com/MetaMask/core/pull/7241))
   - This action is meant to be consumed by the `MultichainAccountService` to encapsulate the act of removing a wallet when seed phrase backup fails in the clients.
 

package/dist/KeyringController.cjs

@@ -519,7 +519,7 @@ class KeyringController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertIsUnlocked).call(this);
         const address = normalize(account);
         const candidates = await Promise.all(__classPrivateFieldGet(this, _KeyringController_keyrings, "f").map(async ({ keyring }) => {
-            return Promise.all([keyring, keyring.getAccounts()]);
+            return [keyring, await keyring.getAccounts()];
         }));
         const winners = candidates.filter((candidate) => {
             const accounts = candidate[1].map(normalize);
@@ -583,7 +583,7 @@ class KeyringController extends base_controller_1.BaseController {
         return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_persistOrRollback).call(this, async () => {
             let privateKey;
             switch (strategy) {
-                case AccountImportStrategy.privateKey:
+                case AccountImportStrategy.privateKey: {
                     const [importedKey] = args;
                     if (!importedKey) {
                         throw new Error('Cannot import an empty key.');
@@ -603,17 +603,19 @@ class KeyringController extends base_controller_1.BaseController {
                     }
                     privateKey = (0, utils_1.remove0x)(prefixed);
                     break;
-                case AccountImportStrategy.json:
+                }
+                case AccountImportStrategy.json: {
                     let wallet;
                     const [input, password] = args;
                     try {
                         wallet = ethereumjs_wallet_1.thirdparty.fromEtherWallet(input, password);
                     }
-                    catch (e) {
-                        wallet = wallet || (await ethereumjs_wallet_1.default.fromV3(input, password, true));
+                    catch {
+                        wallet = wallet ?? (await ethereumjs_wallet_1.default.fromV3(input, password, true));
                     }
-                    privateKey = (0, utils_1.bytesToHex)(wallet.getPrivateKey());
+                    privateKey = (0, utils_1.bytesToHex)(new Uint8Array(wallet.getPrivateKey()));
                     break;
+                }
                 default:
                     throw new Error(`Unexpected import strategy: '${String(strategy)}'`);
             }
@@ -955,7 +957,7 @@ class KeyringController extends base_controller_1.BaseController {
                 keyring = (await this.getKeyringForAccount(selector.address));
             }
             else if ('type' in selector) {
-                keyring = this.getKeyringsByType(selector.type)[selector.index || 0];
+                keyring = this.getKeyringsByType(selector.type)[selector.index ?? 0];
                 if (!keyring && options.createIfMissing) {
                     keyring = (await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_newKeyring).call(this, selector.type, options.createWithData));
                 }
@@ -1240,7 +1242,7 @@ async function _KeyringController_unlockKeyrings(credentials) {
             await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_deriveAndSetEncryptionKey).call(this, credentials.password);
         }
         else {
-            __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_setEncryptionKey).call(this, credentials.encryptionKey, credentials.encryptionSalt || parsedEncryptedVault.salt);
+            __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_setEncryptionKey).call(this, credentials.encryptionKey, credentials.encryptionSalt ?? parsedEncryptedVault.salt);
         }
         const encryptionKey = __classPrivateFieldGet(this, _KeyringController_encryptionKey, "f")?.serialized;
         if (!encryptionKey) {
@@ -1531,11 +1533,11 @@ async function _KeyringController_withRollback(callback) {
         try {
             return await callback({ releaseLock });
         }
-        catch (e) {
+        catch (error) {
             // Keyrings and encryption credentials are restored to their previous state
             __classPrivateFieldSet(this, _KeyringController_encryptionKey, currentEncryptionKey, "f");
             await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_restoreSerializedKeyrings).call(this, currentSerializedKeyrings);
-            throw e;
+            throw error;
         }
     });
 }, _KeyringController_assertControllerMutexIsLocked = function _KeyringController_assertControllerMutexIsLocked() {