fix: only ever create one money account

Author: Jwhiles

packages/money-account-service/src/MoneyAccountService.test.ts

@@ -118,19 +118,12 @@ describe('MoneyAccountService', () => {
       expect(result).toStrictEqual({ id: 'new-money-keyring-id', name: '' });
     });
 
-    it('returns existing money keyring metadata if a money account already exists', async () => {
+    it('returns null if a money account already exists', async () => {
       const { service, mocks } = setup();
-      const MOCK_MONEY_METADATA = { id: 'existing-money-keyring-id', name: '' };
-      const MOCK_MONEY_ADDRESS = '0x1234567890abcdef1234567890abcdef12345678';
 
       mocks.withKeyring.mockImplementation(async (selector, operation) => {
         if ('type' in selector && selector.type === KeyringTypes.money) {
-          return operation({
-            keyring: {
-              getAccounts: jest.fn().mockResolvedValue([MOCK_MONEY_ADDRESS]),
-            },
-            metadata: MOCK_MONEY_METADATA,
-          });
+          return operation();
         }
         return operation({
           keyring: {
@@ -143,38 +136,10 @@ describe('MoneyAccountService', () => {
 
       const result = await service.createMoneyAccount(MOCK_ENTROPY_SOURCE);
 
-      expect(result).toStrictEqual(MOCK_MONEY_METADATA);
+      expect(result).toBeNull();
       expect(mocks.addNewKeyring).not.toHaveBeenCalled();
     });
 
-    it('creates a new money keyring if an existing one has no accounts', async () => {
-      const { service, mocks } = setup();
-
-      mocks.withKeyring.mockImplementation(async (selector, operation) => {
-        if ('type' in selector && selector.type === KeyringTypes.money) {
-          return operation({
-            keyring: {
-              getAccounts: jest.fn().mockResolvedValue([]),
-            },
-            metadata: { id: 'empty-money-keyring-id', name: '' },
-          });
-        }
-        return operation({
-          keyring: {
-            type: 'HD Key Tree',
-            mnemonic: MOCK_MNEMONIC,
-          } as unknown as HdKeyring,
-          metadata: { id: MOCK_ENTROPY_SOURCE, name: '' },
-        });
-      });
-
-      await service.createMoneyAccount(MOCK_ENTROPY_SOURCE);
-
-      expect(mocks.addNewKeyring).toHaveBeenCalledWith(KeyringTypes.money, {
-        mnemonic: MOCK_MNEMONIC,
-      });
-    });
-
     it('re-throws errors other than KeyringNotFound when checking for an existing money keyring', async () => {
       const { service, mocks } = setup();
       const unexpectedError = new KeyringControllerError('Unexpected error');

packages/money-account-service/src/MoneyAccountService.ts

@@ -30,10 +30,14 @@ export class MoneyAccountService {
    * Creates a Money keyring derived from the HD keyring identified by
    * the given entropy source, and returns the new keyring's metadata.
    *
+   * If a keyring already existed, just returns null
+   *
    * @param entropySource - The metadata id of the HD keyring to derive from.
    * @returns The metadata of the newly created Money keyring.
    */
-  async createMoneyAccount(entropySource: string): Promise<KeyringMetadata> {
+  async createMoneyAccount(
+    entropySource: string,
+  ): Promise<KeyringMetadata | null> {
     const mnemonic = await this.#messenger.call(
       'KeyringController:withKeyring',
       { id: entropySource },
@@ -52,27 +56,26 @@ export class MoneyAccountService {
       },
     );
 
-    const existingMoneyMetadata = (await this.#messenger
+    const moneyAccountExists = await this.#messenger
       .call(
         'KeyringController:withKeyring',
         { type: KeyringTypes.money },
-        async ({ keyring, metadata }) => {
-          const accounts = await keyring.getAccounts();
-          return accounts.length > 0 ? metadata : null;
+        async () => {
+          return true;
         },
       )
       .catch((error: unknown) => {
         if (
           error instanceof KeyringControllerError &&
           error.message === KeyringControllerErrorMessage.KeyringNotFound
         ) {
-          return null;
+          return false;
         }
         throw error;
-      })) as KeyringMetadata | null;
+      });
 
-    if (existingMoneyMetadata) {
-      return existingMoneyMetadata;
+    if (moneyAccountExists) {
+      return null;
     }
 
     return await this.#messenger.call(