chore: Update assets and accounts packages

app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.types.tsx

@@ -1,4 +1,4 @@
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 interface SelectedAsset {
   isETH: boolean;

app/components/UI/AccountSelectorList/AccountSelectorList.tsx

@@ -11,7 +11,7 @@ import { selectInternalAccounts } from '../../../selectors/accountsController';
 import Cell, {
   CellVariant,
 } from '../../../component-library/components/Cells/Cell';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { useStyles } from '../../../component-library/hooks';
 import { TextColor } from '../../../component-library/components/Texts/Text';
 import SensitiveText, {

app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx

@@ -52,7 +52,7 @@ import {
   TotalFiatBalancesCrossChains,
   useGetTotalFiatBalanceCrossChains,
 } from '../../../../hooks/useGetTotalFiatBalanceCrossChains';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getChainIdsToPoll } from '../../../../../selectors/tokensController';
 import AggregatedPercentageCrossChains from '../../../../../component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains';
 

app/components/Views/AccountActions/AccountActions.tsx

@@ -11,7 +11,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import Share from 'react-native-share';
 
 // External dependencies
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import BottomSheet, {
   BottomSheetRef,
 } from '../../../component-library/components/BottomSheets/BottomSheet';
@@ -397,7 +397,9 @@ const AccountActions = () => {
             actionTitle={strings('accounts.remove_hardware_account')}
             iconName={IconName.Close}
             onPress={showRemoveHWAlert}
-            testID={AccountActionsBottomSheetSelectorsIDs.REMOVE_HARDWARE_ACCOUNT}
+            testID={
+              AccountActionsBottomSheetSelectorsIDs.REMOVE_HARDWARE_ACCOUNT
+            }
           />
         )}
         {

app/components/Views/AddAccountActions/AddAccountActions.tsx

@@ -20,7 +20,7 @@ import { useMetrics } from '../../../components/hooks/useMetrics';
 
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { CaipChainId } from '@metamask/utils';
-import { KeyringClient } from '@metamask/keyring-api';
+import { KeyringClient } from '@metamask/keyring-snap-client';
 import { BitcoinWalletSnapSender } from '../../../core/SnapKeyring/BitcoinWalletSnap';
 import { MultichainNetworks } from '../../../core/Multichain/constants';
 import { useSelector } from 'react-redux';

app/components/Views/EditAccountName/EditAccountName.tsx

@@ -10,7 +10,7 @@ import { useSelector } from 'react-redux';
 import { SafeAreaView } from 'react-native';
 
 // External dependencies
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import Text from '../../../component-library/components/Texts/Text/Text';
 import { View } from 'react-native-animatable';
 import { TextVariant } from '../../../component-library/components/Texts/Text';

app/components/Views/RevealPrivateCredential/RevealPrivateCredential.tsx

@@ -11,7 +11,7 @@ import {
 } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import QRCode from 'react-native-qrcode-svg';
 import { RouteProp, ParamListBase } from '@react-navigation/native';
 import ScrollableTabView, {

app/components/Views/RevealPrivateCredential/index.test.tsx

@@ -2,11 +2,13 @@ import React from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react-native';
 import configureMockStore from 'redux-mock-store';
 import { Provider } from 'react-redux';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { RevealPrivateCredential } from './';
 import { ThemeContext, mockTheme } from '../../../util/theme';
 import { RevealSeedViewSelectorsIDs } from '../../../../e2e/selectors/Settings/SecurityAndPrivacy/RevealSeedView.selectors';
+import { EthAccountType, EthMethod, EthScopes } from '@metamask/keyring-api';
+import { KeyringTypes } from '@metamask/keyring-controller';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -147,24 +149,26 @@ describe('RevealPrivateCredential', () => {
 
   it('renders with a custom selectedAddress', async () => {
     const mockInternalAccount: InternalAccount = {
-      type: 'eip155:eoa',
+      type: EthAccountType.Eoa,
       id: 'unique-account-id-1',
       address: '0x1234567890123456789012345678901234567890',
       options: {
         someOption: 'optionValue',
         anotherOption: 42,
       },
+      scopes: [EthScopes.Namespace],
       methods: [
-        'personal_sign',
-        'eth_sign',
-        'eth_signTransaction',
-        'eth_sendTransaction',
+        EthMethod.PersonalSign,
+        EthMethod.SignTransaction,
+        EthMethod.SignTypedDataV1,
+        EthMethod.SignTypedDataV3,
+        EthMethod.SignTypedDataV4,
       ],
       metadata: {
         name: 'Test Account',
         importTime: Date.now(),
         keyring: {
-          type: 'HD Key Tree',
+          type: KeyringTypes.hd,
         },
         nameLastUpdatedAt: Date.now(),
         snap: {

app/components/Views/Snaps/KeyringSnapRemovalWarning/KeyringSnapRemovalWarning.tsx

@@ -15,7 +15,7 @@ import BottomSheet, {
 import Text, {
   TextVariant,
 } from '../../../../component-library/components/Texts/Text';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import BannerAlert from '../../../../component-library/components/Banners/Banner/variants/BannerAlert';
 import { BannerAlertSeverity } from '../../../../component-library/components/Banners/Banner';
 import BottomSheetHeader from '../../../../component-library/components/BottomSheets/BottomSheetHeader';
@@ -170,56 +170,56 @@ export default function KeyringSnapRemovalWarning({
             'app_settings.snaps.snap_settings.remove_account_snap_warning.banner_title',
           )}
         />
-          {showConfirmation ? (
-            <>
-              <Text variant={TextVariant.BodyMD} style={styles.description}>
-                {`${strings(
-                  'app_settings.snaps.snap_settings.remove_account_snap_warning.remove_account_snap_alert_description_1',
-                )} `}
-                <Text variant={TextVariant.BodyMDBold}>
-                  {snap.manifest.proposedName}
-                </Text>
-                {` ${strings(
-                  'app_settings.snaps.snap_settings.remove_account_snap_warning.remove_account_snap_alert_description_2',
-                )}`}
+        {showConfirmation ? (
+          <>
+            <Text variant={TextVariant.BodyMD} style={styles.description}>
+              {`${strings(
+                'app_settings.snaps.snap_settings.remove_account_snap_warning.remove_account_snap_alert_description_1',
+              )} `}
+              <Text variant={TextVariant.BodyMDBold}>
+                {snap.manifest.proposedName}
               </Text>
-              <TextInput
-                style={styles.input}
-                value={confirmationInput}
-                onChangeText={handleConfirmationInputChange}
-                testID={KEYRING_SNAP_REMOVAL_WARNING_TEXT_INPUT}
-              />
-              {error && (
-                <Text variant={TextVariant.BodySM} style={styles.errorText}>
-                  {strings(
-                    'app_settings.snaps.snap_settings.remove_account_snap_warning.remove_snap_error',
-                    {
-                      snapName: snap.manifest.proposedName,
-                    },
-                  )}
-                </Text>
-              )}
-            </>
-          ) : (
-            <>
-              <Text variant={TextVariant.BodyMD} style={styles.description}>
+              {` ${strings(
+                'app_settings.snaps.snap_settings.remove_account_snap_warning.remove_account_snap_alert_description_2',
+              )}`}
+            </Text>
+            <TextInput
+              style={styles.input}
+              value={confirmationInput}
+              onChangeText={handleConfirmationInputChange}
+              testID={KEYRING_SNAP_REMOVAL_WARNING_TEXT_INPUT}
+            />
+            {error && (
+              <Text variant={TextVariant.BodySM} style={styles.errorText}>
                 {strings(
-                  'app_settings.snaps.snap_settings.remove_account_snap_warning.description',
+                  'app_settings.snaps.snap_settings.remove_account_snap_warning.remove_snap_error',
+                  {
+                    snapName: snap.manifest.proposedName,
+                  },
                 )}
               </Text>
-              <NativeViewGestureHandler disallowInterruption>
+            )}
+          </>
+        ) : (
+          <>
+            <Text variant={TextVariant.BodyMD} style={styles.description}>
+              {strings(
+                'app_settings.snaps.snap_settings.remove_account_snap_warning.description',
+              )}
+            </Text>
+            <NativeViewGestureHandler disallowInterruption>
               <ScrollView style={styles.scrollView}>
-                  {accountListItems}
-                </ScrollView>
-              </NativeViewGestureHandler>
-            </>
-          )}
-        </View>
-        <BottomSheetFooter
-          style={styles.buttonContainer}
-          buttonsAlignment={ButtonsAlignment.Horizontal}
-          buttonPropsArray={buttonPropsArray}
-        />
+                {accountListItems}
+              </ScrollView>
+            </NativeViewGestureHandler>
+          </>
+        )}
+      </View>
+      <BottomSheetFooter
+        style={styles.buttonContainer}
+        buttonsAlignment={ButtonsAlignment.Horizontal}
+        buttonPropsArray={buttonPropsArray}
+      />
     </BottomSheet>
   );
 }

app/components/Views/Snaps/SnapSettings/SnapSettings.tsx

@@ -31,7 +31,7 @@ import { selectPermissionControllerState } from '../../../../selectors/snaps/per
 import KeyringSnapRemovalWarning from '../KeyringSnapRemovalWarning/KeyringSnapRemovalWarning';
 import { getAccountsBySnapId } from '../../../../core/SnapKeyring/utils/getAccountsBySnapId';
 import { selectInternalAccounts } from '../../../../selectors/accountsController';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import Logger from '../../../../util/Logger';
 interface SnapSettingsProps {
   snap: Snap;
@@ -100,7 +100,6 @@ const SnapSettings = () => {
     setIsShowingSnapKeyringRemoveWarning(false);
   }, []);
 
-
   const removeSnap = useCallback(async () => {
     const { SnapController } = Engine.context;
     await SnapController.removeSnap(snap.id);
@@ -110,8 +109,11 @@ const SnapSettings = () => {
         for (const keyringAccount of keyringAccounts) {
           await Engine.removeAccount(keyringAccount.address);
         }
-      } catch(error) {
-        Logger.error(error as Error, 'SnapSettings: failed to remove snap accounts when calling Engine.removeAccount');
+      } catch (error) {
+        Logger.error(
+          error as Error,
+          'SnapSettings: failed to remove snap accounts when calling Engine.removeAccount',
+        );
       }
     }
     navigation.goBack();
@@ -125,7 +127,6 @@ const SnapSettings = () => {
     }
   }, [isKeyringSnap, keyringAccounts.length, removeSnap]);
 
-
   const handleRemoveSnapKeyring = useCallback(() => {
     try {
       setIsShowingSnapKeyringRemoveWarning(true);

app/components/Views/Snaps/components/KeyringAccountListItem/KeyringAccountListItem.tsx

@@ -1,6 +1,6 @@
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import React, { useCallback } from 'react';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { toChecksumHexAddress } from '@metamask/controller-utils';
 import ButtonIcon, {
   ButtonIconSizes,

app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/types.ts

@@ -1,6 +1,6 @@
 import { AddressBookControllerState } from '@metamask/address-book-controller';
 import { NetworkType } from '@metamask/controller-utils';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import type { NetworkState } from '@metamask/network-controller';
 import { Hex } from '@metamask/utils';
 

app/components/hooks/useAccounts/useAccounts.ts

@@ -31,7 +31,7 @@ import {
   UseAccounts,
   UseAccountsParams,
 } from './useAccounts.types';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getChainIdsToPoll } from '../../../selectors/tokensController';
 import { useGetFormattedTokensPerChain } from '../useGetFormattedTokensPerChain';
 import { useGetTotalFiatBalanceCrossChains } from '../useGetTotalFiatBalanceCrossChains';

app/components/hooks/useAccounts/utils.ts

@@ -1,4 +1,4 @@
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getFormattedAddressFromInternalAccount } from '../../../core/Multichain/utils';
 import { BigNumber } from 'ethers';
 import {

app/components/hooks/useGetFormattedTokensPerChain.test.ts

@@ -5,7 +5,7 @@ import {
 import { backgroundState } from '../../util/test/initial-root-state';
 import { RootState } from '../../reducers';
 import { useGetFormattedTokensPerChain } from './useGetFormattedTokensPerChain';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 const mockInitialState: DeepPartial<RootState> = {
   settings: {},

app/components/hooks/useGetFormattedTokensPerChain.tsx

@@ -16,7 +16,7 @@ import {
   selectCurrentCurrency,
 } from '../../selectors/currencyRateController';
 import { MarketDataDetails, Token } from '@metamask/assets-controllers';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { isTestNet } from '../../util/networks';
 import { selectShowFiatInTestnets } from '../../selectors/settings';
 

app/components/hooks/useGetTotalFiatBalanceCrossChains.test.ts

@@ -5,7 +5,7 @@ import {
 import { backgroundState } from '../../util/test/initial-root-state';
 import { RootState } from '../../reducers';
 import { useGetTotalFiatBalanceCrossChains } from './useGetTotalFiatBalanceCrossChains';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 const mockInitialState: DeepPartial<RootState> = {
   settings: {},

app/components/hooks/useGetTotalFiatBalanceCrossChains.tsx

@@ -11,7 +11,7 @@ import {
   selectCurrencyRates,
   selectCurrentCurrency,
 } from '../../selectors/currencyRateController';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { selectShowFiatInTestnets } from '../../selectors/settings';
 import { isTestNet } from '../../util/networks';
 

app/core/Multichain/test/utils.test.ts

@@ -1,10 +1,12 @@
 import {
-  InternalAccount,
   EthAccountType,
   BtcAccountType,
   EthMethod,
   BtcMethod,
+  EthScopes,
+  BtcScopes,
 } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   isEthAccount,
   isBtcAccount,
@@ -28,6 +30,7 @@ const SOL_ADDRESSES = '7EcDhSYGxXyscszYEp35KHN8vvw3svAuLKTzXwCFLtV';
 const mockEthEOAAccount: InternalAccount = {
   address: MOCK_ETH_ADDRESS,
   id: '1',
+  scopes: [EthScopes.Namespace],
   metadata: {
     name: 'Eth Account 1',
     importTime: 1684232000456,
@@ -49,6 +52,7 @@ const mockEthEOAAccount: InternalAccount = {
 const mockEthERC4337Account: InternalAccount = {
   address: '0xC4966c0D659D99699BFD7EB54D8fafEE40e4a756',
   id: '1',
+  scopes: [EthScopes.Namespace],
   metadata: {
     name: 'Eth Account ERC4337 1',
     importTime: 1684232000456,
@@ -70,6 +74,7 @@ const mockEthERC4337Account: InternalAccount = {
 const mockBTCAccount: InternalAccount = {
   address: MOCK_BTC_MAINNET_ADDRESS,
   id: '1',
+  scopes: [BtcScopes.Namespace],
   metadata: {
     name: 'Bitcoin Account',
     importTime: 1684232000456,

app/core/Multichain/utils.ts

@@ -1,6 +1,6 @@
 import { toChecksumHexAddress } from '@metamask/controller-utils';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
-  InternalAccount,
   EthAccountType,
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   BtcAccountType,

app/core/SnapKeyring/BitcoinWalletSnap.ts

@@ -1,5 +1,5 @@
 import { SnapId } from '@metamask/snaps-sdk';
-import { Sender } from '@metamask/keyring-api';
+import { Sender } from '@metamask/keyring-snap-client';
 import { HandlerType } from '@metamask/snaps-utils';
 import { Json, JsonRpcRequest } from '@metamask/utils';
 // This dependency is still installed as part of the `package.json`, however