@metamask-previews/eth-snap-keyring 20.0.0-018fb62 → 20.0.0-c26e419

package/CHANGELOG.md

@@ -7,14 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Add `SnapKeyringV2` class, a per-snap keyring wrapper with O(1) account lookups by ID and address ([#501](https://github.com/MetaMask/accounts/pull/501))
-
 ### Changed
 
-- Refactor `SnapKeyring` to store accounts in per-snap `SnapKeyringV2` wrappers instead of a single flat map ([#501](https://github.com/MetaMask/accounts/pull/501))
-- Bump `@metamask/keyring-sdk` from none to `^1.1.0`
 - Bump `@metamask/messenger` from `^0.3.0` to `^1.1.1` ([#489](https://github.com/MetaMask/accounts/pull/489), [#500](https://github.com/MetaMask/accounts/pull/500))
 - Bump `@metamask/snaps-controllers` from `^19.0.0` to `^19.0.1` ([#500](https://github.com/MetaMask/accounts/pull/500))
 - Bump `@metamask/snaps-utils` from `^12.1.2` to `^12.1.3` ([#500](https://github.com/MetaMask/accounts/pull/500))

package/dist/SnapKeyring.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SnapKeyring_instances, _SnapKeyring_messenger, _SnapKeyring_snapClient, _SnapKeyring_snapKeyrings, _SnapKeyring_accountIndex, _SnapKeyring_selectedAccounts, _SnapKeyring_requests, _SnapKeyring_options, _SnapKeyring_callbacks, _SnapKeyring_isAnyAccountTypeAllowed, _SnapKeyring_lock, _SnapKeyring_withLock, _SnapKeyring_getOrCreateKeyringV2, _SnapKeyring_isMinimumPlatformVersion, _SnapKeyring_assertAccountCanBeUsed, _SnapKeyring_getExistingAccount, _SnapKeyring_getInternalOptions, _SnapKeyring_handleAccountCreated, _SnapKeyring_handleAccountUpdated, _SnapKeyring_handleAccountDeleted, _SnapKeyring_handleGetSelectedAccounts, _SnapKeyring_handleRequestApproved, _SnapKeyring_handleRequestRejected, _SnapKeyring_rePublishAccountEvent, _SnapKeyring_handleAccountBalancesUpdated, _SnapKeyring_handleAccountAssetListUpdated, _SnapKeyring_handleAccountTransactionsUpdated, _SnapKeyring_getAccount, _SnapKeyring_submitRequest, _SnapKeyring_submitSnapRequest, _SnapKeyring_hasMethod, _SnapKeyring_createRequestPromise, _SnapKeyring_clearRequestPromise, _SnapKeyring_handleSyncResponse, _SnapKeyring_handleAsyncResponse, _SnapKeyring_sanitizeRedirectUrl, _SnapKeyring_validateRedirectUrl, _SnapKeyring_deleteAccount, _SnapKeyring_resolveAddress, _SnapKeyring_updateSelectedAccountsMap, _SnapKeyring_getSnap, _SnapKeyring_getSnapMetadata, _SnapKeyring_getSnapAllowedOrigins, _SnapKeyring_transformToInternalAccount;
+var _SnapKeyring_instances, _SnapKeyring_messenger, _SnapKeyring_snapClient, _SnapKeyring_accounts, _SnapKeyring_selectedAccounts, _SnapKeyring_requests, _SnapKeyring_options, _SnapKeyring_callbacks, _SnapKeyring_isAnyAccountTypeAllowed, _SnapKeyring_lock, _SnapKeyring_withLock, _SnapKeyring_isMinimumPlatformVersion, _SnapKeyring_assertAccountCanBeUsed, _SnapKeyring_getExistingAccount, _SnapKeyring_getInternalOptions, _SnapKeyring_handleAccountCreated, _SnapKeyring_handleAccountUpdated, _SnapKeyring_handleAccountDeleted, _SnapKeyring_handleGetSelectedAccounts, _SnapKeyring_handleRequestApproved, _SnapKeyring_handleRequestRejected, _SnapKeyring_rePublishAccountEvent, _SnapKeyring_handleAccountBalancesUpdated, _SnapKeyring_handleAccountAssetListUpdated, _SnapKeyring_handleAccountTransactionsUpdated, _SnapKeyring_getAccount, _SnapKeyring_submitRequest, _SnapKeyring_submitSnapRequest, _SnapKeyring_hasMethod, _SnapKeyring_createRequestPromise, _SnapKeyring_clearRequestPromise, _SnapKeyring_handleSyncResponse, _SnapKeyring_handleAsyncResponse, _SnapKeyring_sanitizeRedirectUrl, _SnapKeyring_validateRedirectUrl, _SnapKeyring_deleteAccount, _SnapKeyring_resolveAddress, _SnapKeyring_updateSelectedAccountsMap, _SnapKeyring_getSnap, _SnapKeyring_getSnapMetadata, _SnapKeyring_getSnapAllowedOrigins, _SnapKeyring_transformToInternalAccount;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapKeyring = exports.SNAP_KEYRING_TYPE = void 0;
 const tx_1 = require("@ethereumjs/tx");
@@ -28,11 +28,11 @@ const account_1 = require("./account.cjs");
 const DeferredPromise_1 = require("./DeferredPromise.cjs");
 const events_1 = require("./events.cjs");
 const logger_1 = require("./logger.cjs");
+const migrations_1 = require("./migrations/index.cjs");
 const options_1 = require("./options.cjs");
 const platform_versions_1 = require("./platform-versions.cjs");
 const SnapIdMap_1 = require("./SnapIdMap.cjs");
 const SnapKeyringMessenger_1 = require("./SnapKeyringMessenger.cjs");
-const SnapKeyringV2_1 = require("./SnapKeyringV2.cjs");
 const types_1 = require("./types.cjs");
 const util_1 = require("./util.cjs");
 exports.SNAP_KEYRING_TYPE = 'Snap Keyring';
@@ -77,20 +77,10 @@ class SnapKeyring {
          */
         _SnapKeyring_snapClient.set(this, void 0);
         /**
-         * Per-snap keyring wrappers.
-         *
-         * Each entry owns the registry for a single Snap. Accounts are stored and
-         * looked up through these wrappers rather than through the old flat map.
-         */
-        _SnapKeyring_snapKeyrings.set(this, void 0);
-        /**
-         * Reverse index from account ID to the owning Snap ID.
-         *
-         * Populated and kept in sync via the `onRegister` / `onUnregister`
-         * callbacks injected into each `SnapKeyringV2`. Enables O(1) routing for
-         * any "which snap owns this account?" query.
+         * Mapping between account IDs and an object that contains the associated
+         * account object and Snap ID.
          */
-        _SnapKeyring_accountIndex.set(this, void 0);
+        _SnapKeyring_accounts.set(this, void 0);
         /**
          * Mapping between Snap IDs and the selected accounts.
          */
@@ -122,8 +112,7 @@ class SnapKeyring {
         __classPrivateFieldSet(this, _SnapKeyring_messenger, messenger, "f");
         __classPrivateFieldSet(this, _SnapKeyring_snapClient, new keyring_internal_snap_client_1.KeyringInternalSnapClient({ messenger }), "f");
         __classPrivateFieldSet(this, _SnapKeyring_requests, new SnapIdMap_1.SnapIdMap(), "f");
-        __classPrivateFieldSet(this, _SnapKeyring_snapKeyrings, new Map(), "f");
-        __classPrivateFieldSet(this, _SnapKeyring_accountIndex, new Map(), "f");
+        __classPrivateFieldSet(this, _SnapKeyring_accounts, new SnapIdMap_1.SnapIdMap(), "f");
         __classPrivateFieldSet(this, _SnapKeyring_options, new SnapIdMap_1.SnapIdMap(), "f");
         __classPrivateFieldSet(this, _SnapKeyring_callbacks, callbacks, "f");
         __classPrivateFieldSet(this, _SnapKeyring_isAnyAccountTypeAllowed, isAnyAccountTypeAllowed, "f");
@@ -175,27 +164,16 @@ class SnapKeyring {
     /**
      * Serialize the keyring state.
      *
-     * Delegates to each per-snap wrapper and flattens back into the original
-     * external format so that `KeyringController` sees no change.
-     *
      * @returns Serialized keyring state.
      */
     async serialize() {
-        const accounts = {};
-        for (const wrapper of __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").values()) {
-            for (const account of wrapper.accounts()) {
-                accounts[account.id] = { account, snapId: wrapper.snapId };
-            }
-        }
-        return { accounts };
+        return {
+            accounts: __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").toObject(),
+        };
     }
     /**
      * Deserialize the keyring state into this keyring.
      *
-     * Groups the flat persisted state by `snapId`, clears both indexes, then
-     * rebuilds each per-snap wrapper. The `onRegister` callbacks fired during
-     * `wrapper.deserialize()` automatically repopulate `#accountIndex`.
-     *
      * @param state - Serialized keyring state.
      */
     async deserialize(state) {
@@ -204,23 +182,26 @@ class SnapKeyring {
         if (state === undefined) {
             return;
         }
-        // Group flat state by snapId. Migrations and migration logging are handled
-        // inside wrapper.deserialize().
-        const bySnap = new Map();
-        for (const entry of Object.values(state.accounts)) {
-            const snapAccounts = bySnap.get(entry.snapId) ?? {};
-            snapAccounts[entry.account.id] = entry.account;
-            bySnap.set(entry.snapId, snapAccounts);
-        }
-        // Clear both indexes before rebuilding — they must always be consistent.
-        __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").clear();
-        __classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").clear();
-        // Rebuild per-snap wrappers. Migrations run inside wrapper.deserialize().
-        for (const [snapId, accounts] of bySnap) {
-            const wrapper = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyringV2).call(this, snapId);
-            wrapper.deserialize({ snapId, accounts });
-            // onRegister callbacks fired above have repopulated #accountIndex.
+        // Running Snap keyring migrations. We might have some accounts that have a
+        // different "version" than the one we expect.
+        //
+        // In this case, we "transform" then directly when deserializing to convert
+        // them in the final account version.
+        const accounts = {};
+        for (const [snapId, entry] of Object.entries(state.accounts)) {
+            // V1 accounts are missing the scopes.
+            if ((0, migrations_1.isAccountV1)(entry.account)) {
+                console.info(`SnapKeyring - Found a KeyringAccountV1, migrating to V2: ${entry.account.id}`);
+                accounts[snapId] = {
+                    ...entry,
+                    account: (0, migrations_1.migrateAccountV1)(entry.account),
+                };
+            }
+            else {
+                accounts[snapId] = entry;
+            }
         }
+        __classPrivateFieldSet(this, _SnapKeyring_accounts, SnapIdMap_1.SnapIdMap.fromObject(accounts), "f");
     }
     /**
      * Get the addresses of the accounts in this keyring.
@@ -228,13 +209,7 @@ class SnapKeyring {
      * @returns The addresses of the accounts in this keyring.
      */
     async getAccounts() {
-        const addresses = [];
-        for (const wrapper of __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").values()) {
-            for (const account of wrapper.accounts()) {
-                addresses.push(normalizeAccountAddress(account));
-            }
-        }
-        return (0, util_1.unique)(addresses);
+        return (0, util_1.unique)([...__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").values()].map(({ account }) => normalizeAccountAddress(account)));
     }
     /**
      * Get the addresses of the accounts associated with a given Snap.
@@ -243,7 +218,9 @@ class SnapKeyring {
      * @returns The addresses of the accounts associated with the given Snap.
      */
     async getAccountsBySnapId(snapId) {
-        return (0, util_1.unique)((__classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId)?.accounts() ?? []).map(normalizeAccountAddress));
+        return (0, util_1.unique)([...__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").values()]
+            .filter(({ snapId: accountSnapId }) => accountSnapId === snapId)
+            .map(({ account }) => normalizeAccountAddress(account)));
     }
     /**
      * Create an account.
@@ -330,7 +307,7 @@ class SnapKeyring {
                         account = existingAccount;
                     }
                     else {
-                        await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_assertAccountCanBeUsed).call(this, account);
+                        await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_assertAccountCanBeUsed).call(this, snapId, account);
                         // Also check for transient accounts that are not yet part of the keyring
                         // state.
                         if (accountAddresses.has(address) || accountIds.has(account.id)) {
@@ -347,9 +324,8 @@ class SnapKeyring {
                 }
                 // We update the keyring state only if needed.
                 if (newAccounts.length > 0) {
-                    const wrapper = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyringV2).call(this, snapId);
                     for (const account of newAccounts) {
-                        wrapper.setAccount(account);
+                        __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").set(account.id, { account, snapId });
                     }
                     // NOTE: We assume this will never fail, thus, we don't need to rollback the
                     // keyring state if anything goes wrong here.
@@ -376,8 +352,7 @@ class SnapKeyring {
      * @returns `true` if the Snap ID is known, `false` otherwise.
      */
     hasSnapId(snapId) {
-        const wrapper = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId);
-        return wrapper !== undefined && wrapper.accounts().length > 0;
+        return __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").hasSnapId(snapId);
     }
     /**
      * Resolve the Snap account's address associated from a signing request.
@@ -632,13 +607,11 @@ class SnapKeyring {
      * @returns An internal account object for the given address.
      */
     getAccountByAddress(address) {
-        for (const wrapper of __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").values()) {
-            const account = wrapper.lookupByAddress(address);
-            if (account) {
-                return __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_transformToInternalAccount).call(this, account, wrapper.snapId);
-            }
-        }
-        return undefined;
+        const accounts = [...__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").values()];
+        const account = accounts.find(({ account: { address: accountAddress } }) => (0, util_1.equalsIgnoreCase)(accountAddress, address));
+        return account
+            ? __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_transformToInternalAccount).call(this, account.account, account.snapId)
+            : undefined;
     }
     /**
      * List all Snap keyring accounts.
@@ -648,17 +621,11 @@ class SnapKeyring {
      * @returns An array containing all Snap keyring accounts.
      */
     listAccounts() {
-        const accounts = [];
-        for (const wrapper of __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").values()) {
-            for (const account of wrapper.accounts()) {
-                accounts.push(__classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_transformToInternalAccount).call(this, account, wrapper.snapId));
-            }
-        }
-        return accounts;
+        return [...__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").values()].map(({ account, snapId }) => __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_transformToInternalAccount).call(this, account, snapId));
     }
 }
 exports.SnapKeyring = SnapKeyring;
-_SnapKeyring_messenger = new WeakMap(), _SnapKeyring_snapClient = new WeakMap(), _SnapKeyring_snapKeyrings = new WeakMap(), _SnapKeyring_accountIndex = new WeakMap(), _SnapKeyring_selectedAccounts = new WeakMap(), _SnapKeyring_requests = new WeakMap(), _SnapKeyring_options = new WeakMap(), _SnapKeyring_callbacks = new WeakMap(), _SnapKeyring_isAnyAccountTypeAllowed = new WeakMap(), _SnapKeyring_lock = new WeakMap(), _SnapKeyring_instances = new WeakSet(), _SnapKeyring_withLock = 
+_SnapKeyring_messenger = new WeakMap(), _SnapKeyring_snapClient = new WeakMap(), _SnapKeyring_accounts = new WeakMap(), _SnapKeyring_selectedAccounts = new WeakMap(), _SnapKeyring_requests = new WeakMap(), _SnapKeyring_options = new WeakMap(), _SnapKeyring_callbacks = new WeakMap(), _SnapKeyring_isAnyAccountTypeAllowed = new WeakMap(), _SnapKeyring_lock = new WeakMap(), _SnapKeyring_instances = new WeakSet(), _SnapKeyring_withLock = 
 /**
  * Execute an operation behind a lock.
  *
@@ -667,21 +634,6 @@ _SnapKeyring_messenger = new WeakMap(), _SnapKeyring_snapClient = new WeakMap(),
  */
 async function _SnapKeyring_withLock(callback) {
     return __classPrivateFieldGet(this, _SnapKeyring_lock, "f").runExclusive(callback);
-}, _SnapKeyring_getOrCreateKeyringV2 = function _SnapKeyring_getOrCreateKeyringV2(snapId) {
-    let keyring = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId);
-    if (!keyring) {
-        keyring = new SnapKeyringV2_1.SnapKeyringV2({
-            snapId,
-            onRegister: (id) => {
-                __classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").set(id, snapId);
-            },
-            onUnregister: (id) => {
-                __classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").delete(id);
-            },
-        });
-        __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").set(snapId, keyring);
-    }
-    return keyring;
 }, _SnapKeyring_isMinimumPlatformVersion = function _SnapKeyring_isMinimumPlatformVersion(snapId, platformVersion) {
     return __classPrivateFieldGet(this, _SnapKeyring_messenger, "f").call('SnapController:isMinimumPlatformVersion', snapId, platformVersion);
 }, _SnapKeyring_assertAccountCanBeUsed = 
@@ -689,10 +641,11 @@ async function _SnapKeyring_withLock(callback) {
  * Asserts that an account can be used within the Snap keyring. (e.g. generic accounts, unique
  * addresses, etc...).
  *
+ * @param snapId - The account's Snap ID.
  * @param account - The account to check.
  * @throws If the account cannot be used.
  */
-async function _SnapKeyring_assertAccountCanBeUsed(account) {
+async function _SnapKeyring_assertAccountCanBeUsed(snapId, account) {
     const address = normalizeAccountAddress(account);
     // The `AnyAccountType.Account` generic account type is allowed only during
     // development, so we check whether it's allowed before continuing.
@@ -702,8 +655,7 @@ async function _SnapKeyring_assertAccountCanBeUsed(account) {
     }
     // A Snap could try to create an account with a different address but with
     // an existing ID, so the above test only is not enough.
-    // Account IDs are globally unique across all snaps.
-    if (__classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").has(account.id)) {
+    if (__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").has(snapId, account.id)) {
         throw new Error(`Account '${account.id}' already exists`);
     }
     // The UI still uses the account address to identify accounts, so we need
@@ -714,15 +666,14 @@ async function _SnapKeyring_assertAccountCanBeUsed(account) {
     }
 }, _SnapKeyring_getExistingAccount = function _SnapKeyring_getExistingAccount(snapId, account) {
     const address = normalizeAccountAddress(account);
-    // Account creation is idempotent, so we need to check whether the account
-    // already exists and that the right Snap is trying to "create" it again.
+    // Acount creation is idempotent, so we need to check whether the account already exists
+    // and that the right Snap is trying to "create" it again.
     // NOTE: We are not checking account object equality here. If a Snap
-    // re-sends this event with different account data, we will ignore it.
-    const wrapper = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId);
-    const existing = wrapper?.lookupAccount(account.id);
-    if (existing !== undefined &&
-        normalizeAccountAddress(existing) === address) {
-        return existing;
+    // re-send this event with different account data, we will ignore it.
+    const accountEntry = __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").get(snapId, account.id);
+    if (accountEntry !== undefined &&
+        normalizeAccountAddress(accountEntry.account) === address) {
+        return accountEntry.account;
     }
     return undefined; // Not a known account.
 }, _SnapKeyring_getInternalOptions = function _SnapKeyring_getInternalOptions(snapId, correlationId) {
@@ -765,7 +716,7 @@ async function _SnapKeyring_handleAccountCreated(snapId, message) {
         return null;
     }
     // Make sure this new account is valid.
-    await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_assertAccountCanBeUsed).call(this, account);
+    await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_assertAccountCanBeUsed).call(this, snapId, account);
     // A deferred promise that will be resolved once the Snap keyring has saved
     // its internal state.
     // This part of the flow is run asynchronously, so we have no other way of
@@ -786,7 +737,7 @@ async function _SnapKeyring_handleAccountCreated(snapId, message) {
             //
             // e.g The account creation dialog crashed on MetaMask, this callback
             // will never be called, but the Snap still has the account.
-            __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyringV2).call(this, snapId).setAccount(account);
+            __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").set(account.id, { account, snapId });
             // This is the "true async part". We do not `await` for this call, mainly
             // because this callback will persist the account on the client side
             // (through the `AccountsController`).
@@ -835,8 +786,7 @@ async function _SnapKeyring_handleAccountCreated(snapId, message) {
 async function _SnapKeyring_handleAccountUpdated(snapId, message) {
     (0, superstruct_1.assert)(message, events_1.AccountUpdatedEventStruct);
     const { account: newAccountFromEvent } = message.params;
-    const wrapper = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId);
-    const oldAccount = wrapper?.lookupAccount(newAccountFromEvent.id) ??
+    const { account: oldAccount } = __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").get(snapId, newAccountFromEvent.id) ??
         (0, util_1.throwError)(`Account '${newAccountFromEvent.id}' not found`);
     // Potentially migrate the account.
     const newAccount = (0, account_1.transformAccount)(newAccountFromEvent);
@@ -856,7 +806,7 @@ async function _SnapKeyring_handleAccountUpdated(snapId, message) {
     if (!(0, util_1.equalsIgnoreCase)(oldAccount.address, newAccount.address)) {
         throw new Error(`Cannot change address of account '${newAccount.id}'`);
     }
-    __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyringV2).call(this, snapId).setAccount(newAccount);
+    __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").set(newAccount.id, { account: newAccount, snapId });
     await __classPrivateFieldGet(this, _SnapKeyring_callbacks, "f").saveState();
     return null;
 }, _SnapKeyring_handleAccountDeleted = 
@@ -870,15 +820,18 @@ async function _SnapKeyring_handleAccountUpdated(snapId, message) {
 async function _SnapKeyring_handleAccountDeleted(snapId, message) {
     (0, superstruct_1.assert)(message, events_1.AccountDeletedEventStruct);
     const { id } = message.params;
-    const account = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId)?.lookupAccount(id);
+    const entry = __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").get(snapId, id);
     // We can ignore the case where the account was already removed from the
     // keyring, making the deletion idempotent.
     //
     // This happens when the keyring calls the Snap to delete an account, and
     // the Snap calls the keyring back with an `AccountDeleted` event.
-    if (account === undefined) {
+    if (entry === undefined) {
         return null;
     }
+    // At this point we know that the account exists, so we can safely
+    // destructure it.
+    const { account } = entry;
     await __classPrivateFieldGet(this, _SnapKeyring_callbacks, "f").removeAccount(normalizeAccountAddress(account), snapId, async (accepted) => {
         if (accepted) {
             await __classPrivateFieldGet(this, _SnapKeyring_callbacks, "f").saveState();
@@ -942,7 +895,7 @@ async function _SnapKeyring_rePublishAccountEvent(snapId, event, filteredEventCa
     // prevent other Snaps from updating accounts they do not own.
     const filter = (accountMapping) => {
         return Object.entries(accountMapping).reduce((filtered, [accountId, entry]) => {
-            if (__classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").get(accountId) === snapId) {
+            if (__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").has(snapId, accountId)) {
                 // If the Snap owns this account, we can use it.
                 filtered[accountId] = entry;
             }
@@ -1001,14 +954,11 @@ async function _SnapKeyring_handleAccountTransactionsUpdated(snapId, message) {
         return [event];
     });
 }, _SnapKeyring_getAccount = function _SnapKeyring_getAccount(id) {
-    const snapId = __classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").get(id);
-    const account = snapId
-        ? __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId)?.lookupAccount(id)
-        : undefined;
-    if (!snapId || !account) {
+    const found = [...__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").values()].find((entry) => entry.account.id === id);
+    if (!found) {
         throw new Error(`Unable to get account: unknown account ID: '${id}'`);
     }
-    return { account, snapId };
+    return found;
 }, _SnapKeyring_submitRequest = 
 /**
  * Submit a request to a Snap from an account address.
@@ -1163,8 +1113,8 @@ async function _SnapKeyring_handleAsyncResponse(redirect, snapId) {
  */
 async function _SnapKeyring_deleteAccount(snapId, account) {
     // Always remove the account from the maps, even if the Snap is going to
-    // fail to delete it. removeAccount fires onUnregister to clean #accountIndex.
-    __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId)?.removeAccount(account.id);
+    // fail to delete it.
+    __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").delete(snapId, account.id);
     try {
         await __classPrivateFieldGet(this, _SnapKeyring_snapClient, "f").withSnapId(snapId).deleteAccount(account.id);
     }
@@ -1175,18 +1125,12 @@ async function _SnapKeyring_deleteAccount(snapId, account) {
         console.error(`Account '${account.address}' may not have been removed from snap '${snapId}':`, error);
     }
 }, _SnapKeyring_resolveAddress = function _SnapKeyring_resolveAddress(address) {
-    for (const wrapper of __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").values()) {
-        const account = wrapper.lookupByAddress(address);
-        if (account) {
-            return { account, snapId: wrapper.snapId };
-        }
-    }
-    return (0, util_1.throwError)(`Account '${address}' not found`);
+    return ([...__classPrivateFieldGet(this, _SnapKeyring_accounts, "f").values()].find(({ account }) => (0, util_1.equalsIgnoreCase)(account.address, address)) ?? (0, util_1.throwError)(`Account '${address}' not found`));
 }, _SnapKeyring_updateSelectedAccountsMap = function _SnapKeyring_updateSelectedAccountsMap(accounts) {
     const selectedAccounts = __classPrivateFieldGet(this, _SnapKeyring_selectedAccounts, "f");
     selectedAccounts.clear();
     for (const account of accounts) {
-        const snapId = __classPrivateFieldGet(this, _SnapKeyring_accountIndex, "f").get(account);
+        const snapId = __classPrivateFieldGet(this, _SnapKeyring_accounts, "f").getSnapId(account);
         if (!snapId) {
             continue;
         }