feat: create solana account and call discoverAccounts during creation and import of hd keyring

app/actions/multiSrp/index.test.ts

@@ -8,14 +8,14 @@ import {
 } from './';
 import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
 
-jest.mock('../../util/Logger');
-
 const mockSetSelectedAddress = jest.fn();
 const mockAddNewKeyring = jest.fn();
 const mockGetKeyringsByType = jest.fn();
 const mockGetAccounts = jest.fn();
 const mockAddAccounts = jest.fn();
 const mockSetAccountLabel = jest.fn();
+const mockControllerMessenger = jest.fn();
+const mockAddDiscoveredAccounts = jest.fn();
 
 const hdKeyring = {
   getAccounts: () => {
@@ -28,6 +28,17 @@ const hdKeyring = {
   },
 };
 
+const mockSnapClient = {
+  addDiscoveredAccounts: mockAddDiscoveredAccounts,
+};
+
+jest.mock('../../core/SnapKeyring/MultichainWalletSnapClient', () => ({
+  ...jest.requireActual('../../core/SnapKeyring/MultichainWalletSnapClient'),
+  MultichainWalletSnapFactory: {
+    createClient: () => mockSnapClient,
+  },
+}));
+
 jest.mock('../../core/Engine', () => ({
   context: {
     KeyringController: {
@@ -37,10 +48,14 @@ jest.mock('../../core/Engine', () => ({
       withKeyring: (_selector: unknown, operation: (args: unknown) => void) =>
         operation({ keyring: hdKeyring, metadata: { id: '1234' } }),
     },
+    AccountsController: {
+      getNextAvailableAccountName: jest.fn().mockReturnValue('Snap Account 1'),
+    },
   },
   setSelectedAddress: (address: string) => mockSetSelectedAddress(address),
   setAccountLabel: (address: string, label: string) =>
     mockSetAccountLabel(address, label),
+  controllerMessenger: mockControllerMessenger,
 }));
 
 jest.mocked(Engine);
@@ -66,6 +81,7 @@ describe('MultiSRP Actions', () => {
         numberOfAccounts: 1,
       });
       expect(mockSetSelectedAddress).toHaveBeenCalledWith(testAddress);
+      expect(mockAddDiscoveredAccounts).toHaveBeenCalled();
     });
 
     it('throws error if SRP already imported', async () => {

app/actions/multiSrp/index.ts

@@ -3,7 +3,16 @@ import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
 import ExtendedKeyringTypes from '../../constants/keyringTypes';
 import Engine from '../../core/Engine';
 import { KeyringSelector } from '@metamask/keyring-controller';
-import { endPerformanceTrace, startPerformanceTrace } from '../../core/redux/slices/performance';
+///: BEGIN:ONLY_INCLUDE_IF(beta)
+import {
+  MultichainWalletSnapFactory,
+  WalletClientType,
+} from '../../core/SnapKeyring/MultichainWalletSnapClient';
+///: END:ONLY_INCLUDE_IF
+import {
+  endPerformanceTrace,
+  startPerformanceTrace,
+} from '../../core/redux/slices/performance';
 import { PerformanceEventNames } from '../../core/redux/slices/performance/constants';
 import { store } from '../../store';
 
@@ -55,6 +64,14 @@ export async function importNewSecretRecoveryPhrase(mnemonic: string) {
     async ({ keyring }) => keyring.getAccounts(),
   );
 
+  ///: BEGIN:ONLY_INCLUDE_IF(beta)
+  const multichainClient = MultichainWalletSnapFactory.createClient(
+    WalletClientType.Solana,
+  );
+
+  await multichainClient.addDiscoveredAccounts(newKeyring.id);
+  ///: END:ONLY_INCLUDE_IF
+
   return Engine.setSelectedAddress(newAccountAddress);
 }
 

app/components/UI/SolanaNewFeatureContent/SolanaNewFeatureContent.test.tsx

@@ -37,8 +37,15 @@ jest.mock('@metamask/keyring-snap-client', () => ({
   })),
 }));
 
-jest.mock('../../../core/SnapKeyring/SolanaWalletSnap', () => ({
-  SolanaWalletSnapSender: jest.fn(),
+const mockSnapClient = {
+  createAccount: jest.fn(),
+};
+
+jest.mock('../../../core/SnapKeyring/MultichainWalletSnapClient', () => ({
+  ...jest.requireActual('../../../core/SnapKeyring/MultichainWalletSnapClient'),
+  MultichainWalletSnapFactory: {
+    createClient: jest.fn().mockImplementation(() => mockSnapClient),
+  },
 }));
 
 const mockNavigate = jest.fn();

app/components/UI/SolanaNewFeatureContent/SolanaNewFeatureContent.tsx

@@ -21,11 +21,11 @@ import {
 import createStyles from './SolanaNewFeatureContent.styles';
 import StorageWrapper from '../../../store/storage-wrapper';
 import { SOLANA_FEATURE_MODAL_SHOWN } from '../../../constants/storage';
+import { WalletClientType } from '../../../core/SnapKeyring/MultichainWalletSnapClient';
 import Engine from '../../../core/Engine';
 import { SOLANA_NEW_FEATURE_CONTENT_LEARN_MORE } from '../../../constants/urls';
 import Routes from '../../../constants/navigation/Routes';
 import { useNavigation } from '@react-navigation/native';
-import { WalletClientType } from '../../../core/SnapKeyring/MultichainWalletSnapClient';
 
 const SolanaNewFeatureContent = () => {
   const [isVisible, setIsVisible] = useState(false);

app/components/Views/AddNewAccount/AddNewAccount.test.tsx

@@ -62,6 +62,10 @@ const mockMultichainWalletSnapClient = {
 
 jest.mock('../../../core/SnapKeyring/MultichainWalletSnapClient', () => ({
   ...jest.requireActual('../../../core/SnapKeyring/MultichainWalletSnapClient'),
+  WalletClientType: {
+    Bitcoin: 'bitcoin',
+    Solana: 'solana',
+  },
   MultichainWalletSnapFactory: {
     createClient: jest
       .fn()

app/components/Views/AddNewAccount/AddNewAccount.tsx

@@ -15,7 +15,6 @@ import Icon, {
   IconName,
 } from '../../../component-library/components/Icons/Icon';
 import { strings } from '../../../../locales/i18n';
-import Engine from '../../../core/Engine';
 
 // Internal dependencies
 import { AddNewAccountProps } from './AddNewAccount.types';
@@ -36,19 +35,18 @@ import Button, {
 } from '../../../component-library/components/Buttons/Button';
 import SRPList from '../../UI/SRPList';
 import Logger from '../../../util/Logger';
-import { KeyringTypes } from '@metamask/keyring-controller';
 import { getHdKeyringOfSelectedAccountOrPrimaryKeyring } from '../../../selectors/multisrp';
 import {
   MultichainWalletSnapFactory,
   WalletClientType,
 } from '../../../core/SnapKeyring/MultichainWalletSnapClient';
-import { MultichainNetwork } from '@metamask/multichain-transactions-controller';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../component-library/components/BottomSheets/BottomSheet';
 import { useNavigation } from '@react-navigation/native';
 import Routes from '../../../constants/navigation/Routes';
 import { selectInternalAccounts } from '../../../selectors/accountsController';
+import { getMultichainAccountName } from '../../../core/SnapKeyring/utils/getMultichainAccountName';
 
 const AddNewAccount = ({ route }: AddNewAccountProps) => {
   const { navigate } = useNavigation();
@@ -117,50 +115,7 @@ const AddNewAccount = ({ route }: AddNewAccountProps) => {
   }, [clientType, scope, accountName, keyringId, navigate]);
 
   useEffect(() => {
-    const nextAvailableAccountName =
-      Engine.context.AccountsController.getNextAvailableAccountName(
-        clientType ? KeyringTypes.snap : KeyringTypes.hd,
-      );
-    const accountNumber = nextAvailableAccountName.split(' ').pop();
-
-    let accountNameToUse = nextAvailableAccountName;
-    switch (clientType) {
-      case WalletClientType.Bitcoin: {
-        if (scope === MultichainNetwork.BitcoinTestnet) {
-          accountNameToUse = `${strings(
-            'accounts.labels.bitcoin_testnet_account_name',
-          )} ${accountNumber}`;
-          break;
-        }
-        accountNameToUse = `${strings(
-          'accounts.labels.bitcoin_account_name',
-        )} ${accountNumber}`;
-        break;
-      }
-      case WalletClientType.Solana: {
-        switch (scope) {
-          case MultichainNetwork.SolanaDevnet:
-            accountNameToUse = `${strings(
-              'accounts.labels.solana_devnet_account_name',
-            )} ${accountNumber}`;
-            break;
-          case MultichainNetwork.SolanaTestnet:
-            accountNameToUse = `${strings(
-              'accounts.labels.solana_testnet_account_name',
-            )} ${accountNumber}`;
-            break;
-          default:
-            accountNameToUse = `${strings(
-              'accounts.labels.solana_account_name',
-            )} ${accountNumber}`;
-            break;
-        }
-        break;
-      }
-      default:
-        break;
-    }
-    setAccountName(accountNameToUse);
+    setAccountName(getMultichainAccountName(scope, clientType));
   }, [clientType, scope]);
 
   const hdKeyringIndex = useMemo(

app/core/Authentication/Authentication.test.ts

@@ -11,7 +11,6 @@ import AUTHENTICATION_TYPE from '../../constants/userProperties';
 import * as Keychain from 'react-native-keychain';
 import SecureKeychain from '../SecureKeychain';
 import ReduxService, { ReduxStore } from '../redux';
-
 const storage: Record<string, unknown> = {};
 
 jest.mock('../../store/storage-wrapper', () => ({
@@ -30,6 +29,19 @@ jest.mock('../../store/storage-wrapper', () => ({
   }),
 }));
 
+const mockSnapClient = {
+  addDiscoveredAccounts: jest.fn(),
+};
+
+jest.mock('../SnapKeyring/MultichainWalletSnapClient', () => ({
+  MultichainWalletSnapFactory: {
+    createClient: () => mockSnapClient,
+  },
+  WalletClientType: {
+    Solana: 'solana',
+  },
+}));
+
 describe('Authentication', () => {
   afterEach(() => {
     StorageWrapper.clearAll();
@@ -170,4 +182,37 @@ describe('Authentication', () => {
     await Authentication.storePassword('1234', AUTHENTICATION_TYPE.UNKNOWN);
     expect(methodCalled).toBeTruthy();
   });
+
+  describe('Multichain - discoverAccounts', () => {
+    it('calls discoverAccounts after vault creation in newWalletAndKeychain', async () => {
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        dispatch: jest.fn(),
+        getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+      } as unknown as ReduxStore);
+      await Authentication.newWalletAndKeychain('1234', {
+        currentAuthType: AUTHENTICATION_TYPE.UNKNOWN,
+      });
+      expect(mockSnapClient.addDiscoveredAccounts).toHaveBeenCalledWith(
+        expect.any(String), // mock entropySource
+      );
+    });
+
+    it('calls discoverAccounts in newWalletVaultAndRestore', async () => {
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        dispatch: jest.fn(),
+        getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+      } as unknown as ReduxStore);
+      await Authentication.newWalletAndRestore(
+        '1234',
+        {
+          currentAuthType: AUTHENTICATION_TYPE.UNKNOWN,
+        },
+        '1234',
+        false,
+      );
+      expect(mockSnapClient.addDiscoveredAccounts).toHaveBeenCalledWith(
+        expect.any(String), // mock entropySource
+      );
+    });
+  });
 });

app/core/Authentication/Authentication.ts

@@ -31,6 +31,12 @@ import NavigationService from '../NavigationService';
 import Routes from '../../constants/navigation/Routes';
 import { TraceName, TraceOperation, endTrace, trace } from '../../util/trace';
 import ReduxService from '../redux';
+///: BEGIN:ONLY_INCLUDE_IF(beta)
+import {
+  MultichainWalletSnapFactory,
+  WalletClientType,
+} from '../SnapKeyring/MultichainWalletSnapClient';
+///: END:ONLY_INCLUDE_IF(beta)
 
 /**
  * Holds auth data used to determine auth configuration
@@ -85,6 +91,17 @@ class AuthenticationService {
     const { KeyringController }: any = Engine.context;
     if (clearEngine) await Engine.resetState();
     await KeyringController.createNewVaultAndRestore(password, parsedSeed);
+    ///: BEGIN:ONLY_INCLUDE_IF(beta)
+    const primaryHdKeyringId =
+      Engine.context.KeyringController.state.keyringsMetadata[0].id;
+    const client = MultichainWalletSnapFactory.createClient(
+      WalletClientType.Solana,
+      {
+        setSelectedAccount: false,
+      },
+    );
+    await client.addDiscoveredAccounts(primaryHdKeyringId);
+    ///: END:ONLY_INCLUDE_IF(beta)
     password = this.wipeSensitiveData();
     parsedSeed = this.wipeSensitiveData();
   };
@@ -101,6 +118,18 @@ class AuthenticationService {
     const { KeyringController }: any = Engine.context;
     await Engine.resetState();
     await KeyringController.createNewVaultAndKeychain(password);
+
+    ///: BEGIN:ONLY_INCLUDE_IF(beta)
+    const primaryHdKeyringId =
+      Engine.context.KeyringController.state.keyringsMetadata[0].id;
+    const client = MultichainWalletSnapFactory.createClient(
+      WalletClientType.Solana,
+      {
+        setSelectedAccount: false,
+      },
+    );
+    await client.addDiscoveredAccounts(primaryHdKeyringId);
+    ///: END:ONLY_INCLUDE_IF(beta)
     password = this.wipeSensitiveData();
   };