fix add suggest chain issue and add unit test

Author: theothersideofgods

packages/core/__tests__/wallet-manager.test.ts

@@ -93,6 +93,16 @@ describe('WalletManager', () => {
 
   });
 
+  it('should set assetLists for wallets, after walletManager constructor', () => {
+    expect(wallet1.assetLists).toStrictEqual([assetList1, assetList2]);
+    expect(wallet2.assetLists).toStrictEqual([assetList1, assetList2]);
+  })
+
+  it('should set chainMap for wallets, after walletManager constructor', () => {
+    expect(wallet1.chainMap.get(chain1.chainId)).toEqual(chain1);
+    expect(wallet2.chainMap.get(chain1.chainId)).toEqual(chain1);
+  });
+
   it('should initialize wallets', async () => {
     wallet1.init = jest.fn();
     wallet2.init = jest.fn();

packages/core/__tests__/wallets/cosmos-wallet.test.ts

@@ -58,7 +58,7 @@ describe('CosmosWallet', () => {
         expect(mockClient.enable).toHaveBeenCalledWith('cosmoshub-4');
     });
 
-    it('should suggest a chain if connection fails with a specific error', async () => {
+    it('should suggest a chain if connection fails with not "Request rejected"', async () => {
         const mockClient = {
             enable: jest.fn().mockRejectedValue(new Error('some error')),
             experimentalSuggestChain: jest.fn(),
@@ -67,10 +67,23 @@ describe('CosmosWallet', () => {
 
         (chainRegistryChainToKeplr as jest.Mock).mockReturnValue({ chainId: 'cosmoshub-4' });
 
-        await expect(wallet.connect('cosmoshub-4')).rejects.toThrow('some error');
+        await wallet.connect('cosmoshub-4');
+
         expect(mockClient.experimentalSuggestChain).toHaveBeenCalledWith({ chainId: 'cosmoshub-4' });
     });
 
+    it('should not suggest a chain if connection fails with "Request rejected"', async () => {
+        const mockClient = {
+            enable: jest.fn().mockRejectedValue(new Error('Request rejected')),
+            experimentalSuggestChain: jest.fn(),
+        };
+        wallet.client = mockClient;
+
+        await expect(wallet.connect('cosmoshub-4')).rejects.toThrow('Request rejected');
+
+        expect(mockClient.experimentalSuggestChain).not.toHaveBeenCalled();
+    })
+
     it('should disconnect from a chain', async () => {
         const mockClient = { disable: jest.fn() };
         wallet.client = mockClient;
@@ -116,4 +129,14 @@ describe('CosmosWallet', () => {
         expect(chainRegistryChainToKeplr).toHaveBeenCalledWith(cosmosChain, [cosmosAssetList]);
         expect(mockClient.experimentalSuggestChain).toHaveBeenCalledWith({ chainId: 'cosmoshub-4' });
     });
+
+    it('should throw an error if adding a suggested chain fails', async () => {
+        const mockClient = { experimentalSuggestChain: jest.fn().mockRejectedValue(new Error('suggestion error')) };
+        wallet.client = mockClient;
+        wallet.chainMap.set('cosmoshub-4', cosmosChain);
+
+        (chainRegistryChainToKeplr as jest.Mock).mockReturnValue({ chainId: 'cosmoshub-4' });
+
+        await expect(wallet.addSuggestChain('cosmoshub-4')).rejects.toThrow('suggestion error');
+    });
 });

packages/core/src/wallet-manager.ts

@@ -42,6 +42,7 @@ export class WalletManager {
 
     this.wallets.forEach(wallet => {
       wallet.setChainMap(this.chains)
+      wallet.setAssetLists(this.assetLists)
     })
   }
 

packages/core/src/wallets/cosmos-wallet.ts

@@ -35,6 +35,7 @@ export class CosmosWallet extends BaseWallet {
     } catch (error) {
       if ((error as any).message !== `Request rejected`) {
         await this.addSuggestChain(chainId)
+        return
       }
       throw error
     }
@@ -87,7 +88,12 @@ export class CosmosWallet extends BaseWallet {
   async addSuggestChain(chainId: string): Promise<void> {
     const chain = this.chainMap.get(chainId)
     const chainInfo = chainRegistryChainToKeplr(chain, this.assetLists)
-    return this.client.experimentalSuggestChain(chainInfo);
+    try {
+      await this.client.experimentalSuggestChain(chainInfo)
+    } catch (error) {
+      console.log('add suggest chain error', error)
+      throw error
+    }
   }
   async getProvider() {
     return this.client