chore: fix test

Author: aganglada

packages/multichain-account-service/src/index.ts

@@ -22,6 +22,8 @@ export {
   EvmAccountProvider,
   SOL_ACCOUNT_PROVIDER_NAME,
   SolAccountProvider,
+  BTC_ACCOUNT_PROVIDER_NAME,
+  BtcAccountProvider,
 } from './providers';
 export { MultichainAccountWallet } from './MultichainAccountWallet';
 export { MultichainAccountGroup } from './MultichainAccountGroup';

packages/multichain-account-service/src/providers/BtcAccountProvider.test.ts

@@ -13,6 +13,7 @@ import {
   getMultichainAccountServiceMessenger,
   getRootMessenger,
   MOCK_BTC_P2TR_ACCOUNT_1,
+  MOCK_BTC_P2WPKH_ACCOUNT_1,
   MOCK_BTC_P2TR_DISCOVERED_ACCOUNT_1,
   MOCK_HD_ACCOUNT_1,
   MOCK_HD_KEYRING_1,
@@ -42,7 +43,7 @@ class MockBtcKeyring {
   #getIndexFromDerivationPath(derivationPath: string): number {
     // eslint-disable-next-line prefer-regex-literals
     const derivationPathIndexRegex = new RegExp(
-      "^m/44'/501'/(?<index>[0-9]+)'/0'$",
+      "^m/44'/0'/(?<index>[0-9]+)'/0'$",
       'u',
     );
 
@@ -83,7 +84,7 @@ class MockBtcKeyring {
 }
 
 /**
- * Sets up a SolAccountProvider for testing.
+ * Sets up a BtcAccountProvider for testing.
  *
  * @param options - Configuration options for setup.
  * @param options.messenger - An optional messenger instance to use. Defaults to a new Messenger.
@@ -161,7 +162,7 @@ function setup({
 }
 
 describe('BtcAccountProvider', () => {
-  it('getName returns Solana', () => {
+  it('getName returns Bitcoin', () => {
     const { provider } = setup({ accounts: [] });
     expect(provider.getName()).toBe('Bitcoin');
   });
@@ -197,7 +198,7 @@ describe('BtcAccountProvider', () => {
   });
 
   it('creates accounts', async () => {
-    const accounts = [MOCK_BTC_P2TR_ACCOUNT_1];
+    const accounts = [MOCK_BTC_P2TR_ACCOUNT_1, MOCK_BTC_P2WPKH_ACCOUNT_1];
     const { provider, keyring } = setup({
       accounts,
     });
@@ -207,7 +208,7 @@ describe('BtcAccountProvider', () => {
       entropySource: MOCK_HD_KEYRING_1.metadata.id,
       groupIndex: newGroupIndex,
     });
-    expect(newAccounts).toHaveLength(1);
+    expect(newAccounts).toHaveLength(2);
     expect(keyring.createAccount).toHaveBeenCalled();
   });
 
@@ -221,7 +222,7 @@ describe('BtcAccountProvider', () => {
       entropySource: MOCK_HD_KEYRING_1.metadata.id,
       groupIndex: 0,
     });
-    expect(newAccounts).toHaveLength(1);
+    expect(newAccounts).toHaveLength(2);
     expect(newAccounts[0]).toStrictEqual(MOCK_BTC_P2TR_ACCOUNT_1);
   });
 
@@ -261,16 +262,16 @@ describe('BtcAccountProvider', () => {
       groupIndex: 0,
     });
 
-    expect(discovered).toHaveLength(1);
+    expect(discovered).toHaveLength(2);
     // Ensure we did go through creation path
     expect(mocks.keyring.createAccount).toHaveBeenCalled();
     // Provider should now expose one account (newly created)
-    expect(provider.getAccounts()).toHaveLength(1);
+    expect(provider.getAccounts()).toHaveLength(2);
   });
 
   it('returns existing account if it already exists at index', async () => {
     const { provider, mocks } = setup({
-      accounts: [MOCK_BTC_P2TR_ACCOUNT_1],
+      accounts: [MOCK_BTC_P2TR_ACCOUNT_1, MOCK_BTC_P2WPKH_ACCOUNT_1],
     });
 
     // Simulate one discovered account — should resolve to the existing one
@@ -281,7 +282,10 @@ describe('BtcAccountProvider', () => {
       groupIndex: 0,
     });
 
-    expect(discovered).toStrictEqual([MOCK_BTC_P2TR_ACCOUNT_1]);
+    expect(discovered).toStrictEqual([
+      MOCK_BTC_P2TR_ACCOUNT_1,
+      MOCK_BTC_P2WPKH_ACCOUNT_1,
+    ]);
   });
 
   it('does not return any accounts if no account is discovered', async () => {

packages/multichain-account-service/src/providers/BtcAccountProvider.ts

@@ -4,13 +4,12 @@ import { BtcAccountType, BtcScope } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
 import { KeyringClient } from '@metamask/keyring-snap-client';
-import { withTimeout } from '@metamask/snaps-controllers';
 import type { SnapId } from '@metamask/snaps-sdk';
 import { HandlerType } from '@metamask/snaps-utils';
 import type { Json, JsonRpcRequest } from '@metamask/utils';
 
 import { SnapAccountProvider } from './SnapAccountProvider';
-import { withRetry } from './utils';
+import { withRetry, withTimeout } from './utils';
 import type { MultichainAccountServiceMessenger } from '../types';
 
 export type BtcAccountProviderConfig = {
@@ -21,12 +20,12 @@ export type BtcAccountProviderConfig = {
   };
 };
 
-export const BITCOIN_ACCOUNT_PROVIDER_NAME = 'Bitcoin' as const;
+export const BTC_ACCOUNT_PROVIDER_NAME = 'Bitcoin' as const;
 
 export class BtcAccountProvider extends SnapAccountProvider {
-  static NAME = BITCOIN_ACCOUNT_PROVIDER_NAME;
+  static NAME = BTC_ACCOUNT_PROVIDER_NAME;
 
-  static BITCOIN_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;
+  static BTC_SNAP_ID = 'npm:@metamask/bitcoin-wallet-snap' as SnapId;
 
   readonly #client: KeyringClient;
 
@@ -42,9 +41,9 @@ export class BtcAccountProvider extends SnapAccountProvider {
       },
     },
   ) {
-    super(BtcAccountProvider.BITCOIN_SNAP_ID, messenger);
+    super(BtcAccountProvider.BTC_SNAP_ID, messenger);
     this.#client = this.#getKeyringClientFromSnapId(
-      BtcAccountProvider.BITCOIN_SNAP_ID,
+      BtcAccountProvider.BTC_SNAP_ID,
     );
     this.#config = config;
   }

packages/multichain-account-service/src/tests/accounts.ts

@@ -170,7 +170,7 @@ export const MOCK_BTC_P2WPKH_ACCOUNT_1: Bip44Account<InternalAccount> = {
     name: 'Bitcoin Native Segwit Account 1',
     importTime: 0,
     keyring: {
-      type: 'Snap keyring',
+      type: KeyringTypes.snap,
     },
     snap: {
       id: 'mock-btc-snap-id',
@@ -199,7 +199,7 @@ export const MOCK_BTC_P2TR_ACCOUNT_1: Bip44Account<InternalAccount> = {
     name: 'Bitcoin Taproot Account 1',
     importTime: 0,
     keyring: {
-      type: 'Snap keyring',
+      type: KeyringTypes.snap,
     },
     snap: {
       id: 'mock-btc-snap-id',