Merge branch 'main' into release/577.0.0

Author: jeffsmale90

packages/multichain-account-service/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add a timeout around Solana account creation ([#6704](https://github.com/MetaMask/core/pull/6704))
+  - This timeout can be configured at the client level through the config passed to the `MultichainAccountService`.
+
 ## [1.0.0]
 
 ### Changed

packages/multichain-account-service/src/MultichainAccountService.test.ts

@@ -207,6 +207,9 @@ describe('MultichainAccountService', () => {
               maxAttempts: 4,
               backOffMs: 2000,
             },
+            createAccounts: {
+              timeoutMs: 3000,
+            },
           },
         };
 
@@ -236,6 +239,9 @@ describe('MultichainAccountService', () => {
               maxAttempts: 4,
               backOffMs: 2000,
             },
+            createAccounts: {
+              timeoutMs: 3000,
+            },
           },
           // No `EVM_ACCOUNT_PROVIDER_NAME`, cause it's optional in this test.
         };

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

@@ -225,6 +225,27 @@ describe('SolAccountProvider', () => {
     expect(newAccounts[0]).toStrictEqual(MOCK_SOL_ACCOUNT_1);
   });
 
+  it('throws if the account creation process takes too long', async () => {
+    const { provider, mocks } = setup({
+      accounts: [],
+    });
+
+    mocks.keyring.createAccount.mockImplementation(() => {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(MOCK_SOL_ACCOUNT_1);
+        }, 4000);
+      });
+    });
+
+    await expect(
+      provider.createAccounts({
+        entropySource: MOCK_HD_KEYRING_1.metadata.id,
+        groupIndex: 0,
+      }),
+    ).rejects.toThrow('Timed out');
+  });
+
   // Skip this test for now, since we manually inject those options upon
   // account creation, so it cannot fails (until the Solana Snap starts
   // using the new typed options).

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

@@ -22,6 +22,9 @@ export type SolAccountProviderConfig = {
     timeoutMs: number;
     backOffMs: number;
   };
+  createAccounts: {
+    timeoutMs: number;
+  };
 };
 
 export const SOL_ACCOUNT_PROVIDER_NAME = 'Solana' as const;
@@ -43,6 +46,9 @@ export class SolAccountProvider extends SnapAccountProvider {
         maxAttempts: 3,
         backOffMs: 1000,
       },
+      createAccounts: {
+        timeoutMs: 3000,
+      },
     },
   ) {
     super(SolAccountProvider.SOLANA_SNAP_ID, messenger);
@@ -90,7 +96,10 @@ export class SolAccountProvider extends SnapAccountProvider {
     derivationPath: string;
   }): Promise<Bip44Account<KeyringAccount>> {
     const createAccount = await this.getRestrictedSnapAccountCreator();
-    const account = await createAccount({ entropySource, derivationPath });
+    const account = await withTimeout(
+      createAccount({ entropySource, derivationPath }),
+      this.#config.createAccounts.timeoutMs,
+    );
 
     // Ensure entropy is present before type assertion validation
     account.options.entropy = {
@@ -117,6 +126,7 @@ export class SolAccountProvider extends SnapAccountProvider {
       groupIndex,
       derivationPath,
     });
+
     return [account];
   }