chore: rebase main

Author: PatrykLucka

packages/accounts-controller/src/AccountsController.test.ts

@@ -12,14 +12,13 @@ import {
   BtcScope,
   SolScope,
   SolAccountType,
-  SolMethod,
 } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
 import type { NetworkClientId } from '@metamask/network-controller';
 import type { SnapControllerState } from '@metamask/snaps-controllers';
 import { SnapStatus } from '@metamask/snaps-utils';
-import type { CaipChainId, Json } from '@metamask/utils';
+import type { CaipChainId } from '@metamask/utils';
 import * as uuid from 'uuid';
 import type { V4Options } from 'uuid';
 
@@ -629,8 +628,8 @@ describe('AccountsController', () => {
               id: mockAccount4.id,
               name: 'Snap Account 2',
               address: mockAccount4.address,
-              keyringType: mockAccount4.metadata.keyring.type,
-              snapId: mockAccount4.metadata.snap?.id,
+              keyringType: mockAccount4.metadata.keyring.type as KeyringTypes,
+              snap: mockAccount4.metadata.snap,
             }),
           ),
         ]);
@@ -3229,47 +3228,6 @@ describe('AccountsController', () => {
         expect(accountName).toBe('Account 4');
       });
 
-      it('throws error for snap accounts without entropy source', async () => {
-        const messenger = buildMessenger();
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const accountsController = setupAccountsController({
-          initialState: {
-            internalAccounts: {
-              accounts: {},
-              selectedAccount: '',
-            },
-          },
-          messenger,
-        });
-
-        expect(() =>
-          messenger.call('AccountsController:getNextAvailableAccountName', {
-            keyringType: KeyringTypes.snap,
-          }),
-        ).toThrow('Entropy source is required for snap accounts');
-      });
-
-      it('throws error for non-ETH snap accounts without chainId', async () => {
-        const messenger = buildMessenger();
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const accountsController = setupAccountsController({
-          initialState: {
-            internalAccounts: {
-              accounts: {},
-              selectedAccount: '',
-            },
-          },
-          messenger,
-        });
-
-        expect(() =>
-          messenger.call('AccountsController:getNextAvailableAccountName', {
-            keyringType: KeyringTypes.snap,
-            entropySource: 'some-entropy-source',
-          }),
-        ).toThrow('Chain ID is required for non-ETH snap accounts');
-      });
-
       it('throws error for unsupported chain namespace', async () => {
         const messenger = buildMessenger();
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -3443,7 +3401,11 @@ describe('AccountsController', () => {
         address: 'solana-address-1',
         keyringType: KeyringTypes.snap,
         type: SolAccountType.DataAccount,
-        snapId: 'solana-snap-id',
+        snap: {
+          id: 'solana-snap-id',
+          enabled: true,
+          name: 'Solana Snap',
+        },
       });
 
       const mockBitcoinAccount = createExpectedInternalAccount({
@@ -3452,7 +3414,11 @@ describe('AccountsController', () => {
         address: 'bitcoin-address-2',
         keyringType: KeyringTypes.snap,
         type: BtcAccountType.P2wpkh,
-        snapId: 'bitcoin-snap-id',
+        snap: {
+          id: 'bitcoin-snap-id',
+          enabled: true,
+          name: 'Bitcoin Snap',
+        },
       });
 
       const { accountsController } = setupAccountsController({
@@ -3532,7 +3498,11 @@ describe('KeyringController:stateChange handling', () => {
               address: '0x123',
               keyringType: KeyringTypes.snap,
               type: SolAccountType.DataAccount,
-              snapId: 'test-snap-id',
+              snap: {
+                id: 'test-snap-id',
+                enabled: true,
+                name: 'Solana Snap',
+              },
               options: {
                 entropySource: 'test-entropy' as string,
               },
@@ -3548,7 +3518,11 @@ describe('KeyringController:stateChange handling', () => {
       address: '0x123',
       keyringType: KeyringTypes.snap,
       type: SolAccountType.DataAccount,
-      snapId: 'test-snap-id',
+      snap: {
+        id: 'test-snap-id',
+        enabled: true,
+        name: 'Solana Snap',
+      },
     });
 
     // Ensure entropy source is set correctly

packages/accounts-controller/src/tests/mocks.ts

@@ -6,6 +6,8 @@ import {
   EthScope,
   BtcScope,
   SolMethod,
+  SolAccountType,
+  SolScope,
 } from '@metamask/keyring-api';
 import type { CaipChainId, KeyringAccountType } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
@@ -74,11 +76,6 @@ export const createMockInternalAccount = ({
           methods: [...Object.values(BtcMethod)],
           scopes: [BtcScope.Mainnet],
         };
-      case `${KeyringTypes.trezor}`:
-        return {
-          methods: [...Object.values(ETH_EOA_METHODS)],
-          scopes: [EthScope.Eoa],
-        };
       case `${SolAccountType.DataAccount}`:
         return {
           methods: [...Object.values(SolMethod)],