@metamask-previews/keyring-controller 19.0.5-preview-aec8dc46 → 19.0.5-preview-0adfc600

package/dist/KeyringController.cjs

@@ -51,7 +51,6 @@ const ethereumjs_wallet_1 = __importStar(require("ethereumjs-wallet"));
 // When generating a ULID within the same millisecond, monotonicFactory provides some guarantees regarding sort order.
 const ulid_1 = require("ulid");
 const constants_1 = require("./constants.cjs");
-const ulid = (0, ulid_1.monotonicFactory)();
 const name = 'KeyringController';
 /**
  * Available keyring types
@@ -845,6 +844,9 @@ class KeyringController extends base_controller_1.BaseController {
             keyring = __classPrivateFieldGet(this, _KeyringController_keyrings, "f")[0];
         }
         else {
+            console.log('keyrings: ', __classPrivateFieldGet(this, _KeyringController_keyrings, "f"));
+            console.log('keyringId: ', keyringId);
+            console.log('metadata: ', __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f"));
             keyring = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringById).call(this, keyringId);
             if (keyring.type !== KeyringTypes.hd) {
                 throw new Error(constants_1.KeyringControllerError.UnsupportedVerifySeedPhrase);
@@ -1154,6 +1156,7 @@ async function _KeyringController_verifySeedPhrase(keyringId) {
     const keyring = keyringId
         ? __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringById).call(this, keyringId)
         : this.getKeyringsByType(KeyringTypes.hd)[0];
+    // This will never going to be undefined because we are checking for it in all of the callers
     if (!keyring) {
         throw new Error('No HD keyring found.');
     }
@@ -1229,9 +1232,6 @@ async function _KeyringController_restoreSerializedKeyrings(serializedKeyrings)
     for (const serializedKeyring of serializedKeyrings) {
         await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_restoreKeyring).call(this, serializedKeyring);
     }
-    if (__classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f").length > __classPrivateFieldGet(this, _KeyringController_keyrings, "f").length) {
-        throw new Error(constants_1.KeyringControllerError.KeyringMetadataLengthMismatch);
-    }
 }, _KeyringController_unlockKeyrings = 
 /**
  * Unlock Keyrings, decrypting the vault and deserializing all
@@ -1403,7 +1403,7 @@ async function _KeyringController_createKeyringWithFirstAccount(type, opts) {
 async function _KeyringController_newKeyring(type, data) {
     __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertControllerMutexIsLocked).call(this);
     const newKeyringMetadata = {
-        id: ulid().toString(),
+        id: (0, ulid_1.ulid)(),
         name: '',
     };
     const keyringBuilder = __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getKeyringBuilderForType).call(this, type);
@@ -1449,10 +1449,6 @@ async function _KeyringController_clearKeyrings() {
         await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_destroyKeyring).call(this, keyring);
     }
     __classPrivateFieldSet(this, _KeyringController_keyrings, [], "f");
-    __classPrivateFieldSet(this, _KeyringController_keyringsMetadata, [], "f");
-    // this.update((state) => {
-    //   state.keyringsMetadata = [];
-    // });
 }, _KeyringController_restoreKeyring = 
 /**
  * Restore a Keyring from a provided serialized payload.
@@ -1570,6 +1566,7 @@ async function _KeyringController_withRollback(callback) {
     return __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_withControllerLock).call(this, async ({ releaseLock }) => {
         const currentSerializedKeyrings = await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_getSerializedKeyrings).call(this);
         const currentPassword = __classPrivateFieldGet(this, _KeyringController_password, "f");
+        const currentKeyringsMetadata = __classPrivateFieldGet(this, _KeyringController_keyringsMetadata, "f");
         try {
             return await callback({ releaseLock });
         }
@@ -1577,6 +1574,7 @@ async function _KeyringController_withRollback(callback) {
             // Keyrings and password are restored to their previous state
             await __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_restoreSerializedKeyrings).call(this, currentSerializedKeyrings);
             __classPrivateFieldSet(this, _KeyringController_password, currentPassword, "f");
+            __classPrivateFieldSet(this, _KeyringController_keyringsMetadata, currentKeyringsMetadata, "f");
             throw e;
         }
     });