fix: disconnect error during transport reset (iOS devices only)

jest.config.js

@@ -41,10 +41,10 @@ module.exports = {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 87.94,
+      branches: 89.28,
       functions: 95.91,
-      lines: 91.13,
-      statements: 91.22,
+      lines: 91.32,
+      statements: 91.41,
     },
   },
 

src/ledger-keyring.test.ts

@@ -191,7 +191,7 @@ describe('LedgerKeyring', function () {
       expect(serialized.deviceId).toBe('some-device');
     });
 
-    it('should migrate accountIndexes to accountDetails', async function () {
+    it('migrates accountIndexes to accountDetails', async function () {
       const someHdPath = `m/44'/60'/0'/0/0`;
       const account = fakeAccounts[1];
       const checksum = ethUtil.toChecksumAddress(account);
@@ -211,7 +211,7 @@ describe('LedgerKeyring', function () {
       });
     });
 
-    it('should migrate non-bip44 accounts to accountDetails', async function () {
+    it('migrates non-bip44 accounts to accountDetails', async function () {
       const someHdPath = `m/44'/60'/0'`;
       const account = fakeAccounts[1];
       const checksum = ethUtil.toChecksumAddress(account);
@@ -229,6 +229,28 @@ describe('LedgerKeyring', function () {
         hdPath: `m/44'/60'/0'/1`,
       });
     });
+
+    it('throws errors when address is not found', async function () {
+      const hdPath = `m/44'/60'/0'`;
+      const account = '0x90A5b70d94418d6c25C19071e5b8170607f6302D';
+
+      let thrownError;
+      const accountIndexes: Record<string, number> = {};
+      accountIndexes['0x90a'] = 1;
+
+      try {
+        await keyring.deserialize({
+          hdPath,
+          accounts: [account],
+          deviceId: 'some-device',
+          implementFullBIP44: true,
+          accountIndexes,
+        });
+      } catch (error) {
+        thrownError = error;
+      }
+      expect(thrownError).toStrictEqual(new Error('Unknown address'));
+    });
   });
 
   describe('setDeviceId', function () {
@@ -440,12 +462,12 @@ describe('LedgerKeyring', function () {
   });
 
   describe('getFirstPage', function () {
-    it('should set the currentPage to 1', async function () {
+    it('sets the currentPage to 1', async function () {
       await keyring.getFirstPage();
       expect(keyring.page).toBe(1);
     });
 
-    it('should return the list of accounts for current page', async function () {
+    it('returns the list of accounts for current page', async function () {
       const accounts = await keyring.getFirstPage();
 
       expect(accounts).toHaveLength(keyring.perPage);
@@ -978,6 +1000,14 @@ describe('LedgerKeyring', function () {
       );
     });
 
+    it('throws an error if the version is not provided', async function () {
+      await expect(
+        keyring.signTypedData(fakeAccounts[0], fixtureData),
+      ).rejects.toThrow(
+        'Ledger: Only version 4 of typed data signing is supported',
+      );
+    });
+
     it('throws an error if the hdPath is not found', async function () {
       jest
         .spyOn(keyring, 'unlockAccountByAddress')

src/ledger-keyring.ts

@@ -22,6 +22,7 @@ const pathBase = 'm';
 const hdPathString = `${pathBase}/44'/60'/0'`;
 const keyringType = 'Ledger Hardware';
 
+// This number make one of our failure test very slow which for loop need to run 1000 times.
 const MAX_INDEX = 1000;
 
 enum NetworkApiUrls {

src/ledger-transport-middleware.test.ts

@@ -62,5 +62,12 @@ describe('LedgerTransportMiddleware', function () {
       const app = transportMiddleware.getEthApp();
       expect(app).toBeDefined();
     });
+
+    it('throw error when transport not set', async function () {
+      transportMiddleware = new LedgerTransportMiddleware();
+      expect(() => transportMiddleware.getEthApp()).toThrow(
+        'Instance `transport` is not initialized.',
+      );
+    });
   });
 });

src/ledger-transport-middleware.ts

@@ -20,8 +20,6 @@ export class LedgerTransportMiddleware implements TransportMiddleware {
 
   readonly transportEncoding = 'ascii';
 
-  #app?: MetaMaskLedgerHwAppEth;
-
   #transport?: Transport;
 
   /**
@@ -60,9 +58,6 @@ export class LedgerTransportMiddleware implements TransportMiddleware {
    * @returns An generic interface for communicating with a Ledger hardware wallet to perform operation.
    */
   getEthApp(): MetaMaskLedgerHwAppEth {
-    if (!this.#app) {
-      this.#app = new MetaMaskLedgerHwAppEth(this.getTransport());
-    }
-    return this.#app;
+    return new MetaMaskLedgerHwAppEth(this.getTransport());
   }
 }