chore: bump @metamask/{keyring, profile-sync}-controller

app/scripts/controllers/mmi-controller.test.ts

@@ -313,10 +313,11 @@ describe('MMIController', function () {
       const type = 'mock-keyring-type';
       mmiController.keyringController.getKeyringsByType = jest
         .fn()
-        .mockReturnValue([]);
+        .mockReturnValueOnce([])
+        .mockReturnValueOnce(['new-keyring']);
       mmiController.keyringController.addNewKeyring = jest
         .fn()
-        .mockResolvedValue('new-keyring');
+        .mockResolvedValue('new-keyring-metadata');
 
       const result = await mmiController.addKeyringIfNotExists(type);
 

app/scripts/controllers/mmi-controller.ts

@@ -226,7 +226,8 @@ export class MMIController {
   async addKeyringIfNotExists(type: KeyringTypes) {
     let keyring = await this.keyringController.getKeyringsByType(type)[0];
     if (!keyring) {
-      keyring = await this.keyringController.addNewKeyring(type);
+      await this.keyringController.addNewKeyring(type);
+      [keyring] = await this.keyringController.getKeyringsByType(type);
     }
     return keyring;
   }

app/scripts/metamask-controller.js

@@ -189,9 +189,6 @@ import {
   LedgerTransportTypes,
 } from '../../shared/constants/hardware-wallets';
 import { KeyringType } from '../../shared/constants/keyring';
-///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
-import { findKeyringId } from '../../shared/lib/keyring';
-///: END:ONLY_INCLUDE_IF
 import {
   RestrictedMethods,
   ExcludedSnapPermissions,
@@ -2455,11 +2452,14 @@ export default class MetamaskController extends EventEmitter {
    * @returns {SnapKeyring}
    */
   async getSnapKeyring() {
+    // TODO: Use `withKeyring` instead
     let [snapKeyring] = this.keyringController.getKeyringsByType(
       KeyringType.snap,
     );
     if (!snapKeyring) {
-      snapKeyring = await this.keyringController.addNewKeyring(
+      await this.keyringController.addNewKeyring(KeyringType.snap);
+      // TODO: Use `withKeyring` instead
+      [snapKeyring] = this.keyringController.getKeyringsByType(
         KeyringType.snap,
       );
     }
@@ -2633,7 +2633,7 @@ export default class MetamaskController extends EventEmitter {
                 {
                   id: source,
                 },
-                async (keyring) => ({
+                async ({ keyring }) => ({
                   type: keyring.type,
                   mnemonic: keyring.mnemonic,
                 }),
@@ -4316,7 +4316,7 @@ export default class MetamaskController extends EventEmitter {
     try {
       // TODO: `getKeyringsByType` is deprecated, this logic should probably be moved to the `KeyringController`.
       // FIXME: The `KeyringController` does not check yet for duplicated accounts with HD keyrings, see: https://github.com/MetaMask/core/issues/5411
-      const alreadyImportedSrp = await this.keyringController
+      const alreadyImportedSrp = this.keyringController
         .getKeyringsByType(KeyringTypes.hd)
         .some((keyring) => {
           return (
@@ -4332,26 +4332,22 @@ export default class MetamaskController extends EventEmitter {
         );
       }
 
-      const newKeyring = await this.keyringController.addNewKeyring(
+      const { id } = await this.keyringController.addNewKeyring(
         KeyringTypes.hd,
         {
           mnemonic,
           numberOfAccounts: 1,
         },
       );
-      const [newAccountAddress] = await newKeyring.getAccounts();
+      const [newAccountAddress] = await this.keyringController.withKeyring(
+        { id },
+        async ({ keyring }) => keyring.getAccounts(),
+      );
       const account =
         this.accountsController.getAccountByAddress(newAccountAddress);
       this.accountsController.setSelectedAccount(account.id);
 
-      // TODO: Find a way to encapsulate this logic in the KeyringController itself.
-      const { keyrings, keyringsMetadata } = this.keyringController.state;
-      const keyringId = findKeyringId(keyrings, keyringsMetadata, {
-        address: newAccountAddress,
-        type: KeyringTypes.hd,
-      });
-
-      await this._addAccountsWithBalance(keyringId);
+      await this._addAccountsWithBalance(id);
 
       return newAccountAddress;
     } finally {
@@ -4372,10 +4368,13 @@ export default class MetamaskController extends EventEmitter {
     const releaseLock = await this.createVaultMutex.acquire();
     try {
       // addNewKeyring auto creates 1 account.
-      const newHdkeyring = await this.keyringController.addNewKeyring(
+      const { id } = await this.keyringController.addNewKeyring(
         KeyringTypes.hd,
       );
-      const [newAccount] = await newHdkeyring.getAccounts();
+      const [newAccount] = await this.keyringController.withKeyring(
+        { id },
+        async ({ keyring }) => keyring.getAccounts(),
+      );
       const account = this.accountsController.getAccountByAddress(newAccount);
       this.accountsController.setSelectedAccount(account.id);
 
@@ -4451,7 +4450,7 @@ export default class MetamaskController extends EventEmitter {
 
       const accounts = await this.keyringController.withKeyring(
         keyringSelector,
-        async (keyring) => {
+        async ({ keyring }) => {
           return await keyring.getAccounts();
         },
       );
@@ -4487,7 +4486,7 @@ export default class MetamaskController extends EventEmitter {
         // This account has assets, so check the next one
         address = await this.keyringController.withKeyring(
           keyringSelector,
-          async (keyring) => {
+          async ({ keyring }) => {
             const [newAddress] = await keyring.addAccounts(1);
             return newAddress;
           },
@@ -4770,11 +4769,13 @@ export default class MetamaskController extends EventEmitter {
     // The `getKeyringForAccount` is now deprecated, so we just use `withKeyring` instead to access our keyring.
     return await this.keyringController.withKeyring(
       { address },
-      ({ type: keyringType, bridge: keyringBridge }) =>
+      ({ keyring }) => {
+        const { type: keyringType, bridge: keyringBridge } = keyring;
         // Specific case for OneKey devices, see `ONE_KEY_VIA_TREZOR_MINOR_VERSION` for further details.
-        keyringBridge?.minorVersion === ONE_KEY_VIA_TREZOR_MINOR_VERSION
+        return keyringBridge?.minorVersion === ONE_KEY_VIA_TREZOR_MINOR_VERSION
           ? HardwareKeyringType.oneKey
-          : HardwareKeyringType[keyringType],
+          : HardwareKeyringType[keyringType];
+      },
     );
   }
 
@@ -4832,23 +4833,26 @@ export default class MetamaskController extends EventEmitter {
    * @returns {'ledger' | 'lattice' | string | undefined}
    */
   async getDeviceModel(address) {
-    return this.keyringController.withKeyring({ address }, async (keyring) => {
-      switch (keyring.type) {
-        case KeyringType.trezor:
-        case KeyringType.oneKey:
-          return keyring.getModel();
-        case KeyringType.qr:
-          return keyring.getName();
-        case KeyringType.ledger:
-          // TODO: get model after ledger keyring exposes method
-          return HardwareDeviceNames.ledger;
-        case KeyringType.lattice:
-          // TODO: get model after lattice keyring exposes method
-          return HardwareDeviceNames.lattice;
-        default:
-          return undefined;
-      }
-    });
+    return this.keyringController.withKeyring(
+      { address },
+      async ({ keyring }) => {
+        switch (keyring.type) {
+          case KeyringType.trezor:
+          case KeyringType.oneKey:
+            return keyring.getModel();
+          case KeyringType.qr:
+            return keyring.getName();
+          case KeyringType.ledger:
+            // TODO: get model after ledger keyring exposes method
+            return HardwareDeviceNames.ledger;
+          case KeyringType.lattice:
+            // TODO: get model after lattice keyring exposes method
+            return HardwareDeviceNames.lattice;
+          default:
+            return undefined;
+        }
+      },
+    );
   }
 
   /**
@@ -4936,7 +4940,7 @@ export default class MetamaskController extends EventEmitter {
 
     const addedAccountAddress = await this.keyringController.withKeyring(
       keyringSelector,
-      async (keyring) => {
+      async ({ keyring }) => {
         if (keyring.type !== KeyringTypes.hd) {
           throw new Error('Cannot add account to non-HD keyring');
         }
@@ -7573,7 +7577,7 @@ export default class MetamaskController extends EventEmitter {
 
     return this.keyringController.withKeyring(
       { type: keyringType },
-      async (keyring) => {
+      async ({ keyring }) => {
         if (options.hdPath && keyring.setHdPath) {
           keyring.setHdPath(options.hdPath);
         }

app/scripts/metamask-controller.test.js

@@ -195,6 +195,7 @@ const buildMockKeyringBridge = (publicKeyPayload) =>
   jest.fn(() => ({
     init: jest.fn(),
     dispose: jest.fn(),
+    destroy: jest.fn(),
     updateTransportMethod: jest.fn(),
     getPublicKey: jest.fn(async () => publicKeyPayload),
   }));
@@ -214,6 +215,7 @@ jest.mock('@metamask/eth-ledger-bridge-keyring', () => ({
   ...jest.requireActual('@metamask/eth-ledger-bridge-keyring'),
   LedgerIframeBridge: buildMockKeyringBridge({
     publicKey: KNOWN_PUBLIC_KEY,
+    address: KNOWN_PUBLIC_KEY_ADDRESSES[0].address,
     chainCode: '0x1',
   }),
 }));
@@ -1859,7 +1861,7 @@ describe('MetaMaskController', () => {
           async (type) => {
             jest
               .spyOn(metamaskController.keyringController, 'withKeyring')
-              .mockImplementation((_, fn) => fn({ type }));
+              .mockImplementation((_, fn) => fn({ keyring: { type } }));
 
             const result = await metamaskController.getHardwareTypeForMetric(
               '0x123',
@@ -1877,7 +1879,7 @@ describe('MetaMaskController', () => {
                 type: 'trezor',
                 bridge: { minorVersion: ONE_KEY_VIA_TREZOR_MINOR_VERSION },
               };
-              return fn(keyring);
+              return fn({ keyring });
             });
 
           const result = await metamaskController.getHardwareTypeForMetric(

lavamoat/browserify/beta/policy.json

@@ -1147,8 +1147,8 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
         "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
-        "webpack>events": true,
         "@metamask/eth-trezor-keyring>hdkey": true
       }
     },

lavamoat/browserify/flask/policy.json

@@ -1147,8 +1147,8 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
         "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
-        "webpack>events": true,
         "@metamask/eth-trezor-keyring>hdkey": true
       }
     },

lavamoat/browserify/main/policy.json

@@ -1147,8 +1147,8 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
         "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
-        "webpack>events": true,
         "@metamask/eth-trezor-keyring>hdkey": true
       }
     },

lavamoat/browserify/mmi/policy.json

@@ -1239,8 +1239,8 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
         "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
-        "webpack>events": true,
         "@metamask/eth-trezor-keyring>hdkey": true
       }
     },

package.json

@@ -271,19 +271,19 @@
     "@metamask/ens-resolver-snap": "^0.1.2",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
     "@metamask/eth-json-rpc-middleware": "^15.1.2",
-    "@metamask/eth-ledger-bridge-keyring": "^8.0.3",
+    "@metamask/eth-ledger-bridge-keyring": "^9.0.0",
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/eth-snap-keyring": "^11.1.0",
     "@metamask/eth-token-tracker": "^10.0.2",
-    "@metamask/eth-trezor-keyring": "^6.0.0",
+    "@metamask/eth-trezor-keyring": "^6.1.1",
     "@metamask/etherscan-link": "^3.0.0",
     "@metamask/gas-fee-controller": "^22.0.3",
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/json-rpc-engine": "^10.0.0",
     "@metamask/json-rpc-middleware-stream": "^8.0.4",
     "@metamask/keyring-api": "^17.2.1",
-    "@metamask/keyring-controller": "^19.2.0",
-    "@metamask/keyring-internal-api": "^4.0.3",
+    "@metamask/keyring-controller": "^20.0.0",
+    "@metamask/keyring-internal-api": "^5.0.0",
     "@metamask/keyring-snap-client": "^4.0.1",
     "@metamask/logging-controller": "^6.0.4",
     "@metamask/logo": "^4.0.0",
@@ -305,7 +305,7 @@
     "@metamask/post-message-stream": "^9.0.0",
     "@metamask/ppom-validator": "0.36.0",
     "@metamask/preinstalled-example-snap": "^0.3.0",
-    "@metamask/profile-sync-controller": "^8.1.1",
+    "@metamask/profile-sync-controller": "^9.0.0",
     "@metamask/providers": "^20.0.0",
     "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.3",