fix(multichain-account-service)!: wait for Snap platform to be ready

packages/multichain-account-service/CHANGELOG.md

@@ -7,8 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Wait for Snap platform to be ready before any wallet/group operations ([#7266](https://github.com/MetaMask/core/pull/7266))
+
 ### Changed
 
+- **BREAKING:** Abstract method `SnapAccountProvider.createAccounts` has been renamed `runCreateAccounts` ([#7266](https://github.com/MetaMask/core/pull/7266))
+  - `SnapAccountProvider.createAccounts` is now implemented by `SnapAccountProvider` directly and automatically wait for the Snap platform to be ready before calling `runCreateAccounts`.
+- **BREAKING:** Abstract method `SnapAccountProvider.discoverAccounts` has been renamed `runDiscoverAccounts` ([#7266](https://github.com/MetaMask/core/pull/7266))
+  - `SnapAccountProvider.discoverAccounts` is now implemented by `SnapAccountProvider` directly and automatically wait for the Snap platform to be ready before calling `runDiscoverAccounts`.
 - Move peer dependencies for controller and service packages to direct dependencies ([#7209](https://github.com/MetaMask/core/pull/7209))
   - The dependencies moved are:
     - `@metamask/accounts-controller` (^35.0.0)

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

@@ -62,6 +62,23 @@ export abstract class BaseBip44AccountProvider implements Bip44AccountProvider {
 
   abstract getName(): string;
 
+  protected getAnyAccount(): Bip44Account<KeyringAccount> | undefined {
+    const anyAccount = this.messenger
+      .call(
+        // NOTE: Even though the name is misleading, this only fetches all internal
+        // accounts, including EVM and non-EVM. We might wanna change this action
+        // name once we fully support multichain accounts.
+        'AccountsController:listMultichainAccounts',
+      )
+      .find((account) => {
+        return isBip44Account(account) && this.isAccountCompatible(account);
+      });
+
+    // We cast here since `.find` will return a `InternalAccount | undefined`
+    // despite having the `isBip44Account` check.
+    return anyAccount as Bip44Account<KeyringAccount> | undefined;
+  }
+
   #getAccounts(
     filter: (account: KeyringAccount) => boolean = () => true,
   ): Bip44Account<KeyringAccount>[] {

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

@@ -96,6 +96,11 @@ class MockBtcKeyring {
       return account;
     });
 }
+class MockBtcAccountProvider extends BtcAccountProvider {
+  override async ensureSnapPlatformIsReady(): Promise<void> {
+    // Override to avoid waiting during tests.
+  }
+}
 
 /**
  * Sets up a BtcAccountProvider for testing.
@@ -153,7 +158,7 @@ function setup({
   const multichainMessenger = getMultichainAccountServiceMessenger(messenger);
   const provider = new AccountProviderWrapper(
     multichainMessenger,
-    new BtcAccountProvider(multichainMessenger),
+    new MockBtcAccountProvider(multichainMessenger),
   );
 
   return {
@@ -348,7 +353,7 @@ describe('BtcAccountProvider', () => {
 
       const multichainMessenger =
         getMultichainAccountServiceMessenger(messenger);
-      const btcProvider = new BtcAccountProvider(
+      const btcProvider = new MockBtcAccountProvider(
         multichainMessenger,
         undefined,
         mockTrace,
@@ -400,7 +405,7 @@ describe('BtcAccountProvider', () => {
 
       const multichainMessenger =
         getMultichainAccountServiceMessenger(messenger);
-      const btcProvider = new BtcAccountProvider(
+      const btcProvider = new MockBtcAccountProvider(
         multichainMessenger,
         undefined,
         mockTrace,
@@ -433,7 +438,7 @@ describe('BtcAccountProvider', () => {
 
       const multichainMessenger =
         getMultichainAccountServiceMessenger(messenger);
-      const btcProvider = new BtcAccountProvider(
+      const btcProvider = new MockBtcAccountProvider(
         multichainMessenger,
         undefined,
         mockTrace,

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

@@ -52,7 +52,7 @@ export class BtcAccountProvider extends SnapAccountProvider {
     );
   }
 
-  async createAccounts({
+  async runCreateAccounts({
     entropySource,
     groupIndex: index,
   }: {
@@ -77,7 +77,7 @@ export class BtcAccountProvider extends SnapAccountProvider {
     });
   }
 
-  async discoverAccounts({
+  async runDiscoverAccounts({
     entropySource,
     groupIndex,
   }: {