refactor: indexFromAddress and pathFromAddress

Author: mikesposito

packages/keyring-eth-qr/jest.config.js

@@ -20,10 +20,10 @@ module.exports = merge(baseConfig, {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 91.66,
+      branches: 96.66,
       functions: 100,
-      lines: 94.97,
-      statements: 95.07,
+      lines: 98.99,
+      statements: 99.01,
     },
   },
 });

packages/keyring-eth-qr/src/device.ts

@@ -274,7 +274,20 @@ export class Device {
       return path;
     }
 
-    const index = this.indexFromAddress(normalizedAddress);
+    let index = this.#pairedDevice.indexes[normalizedAddress];
+    if (index === undefined) {
+      for (let i = 0; i < MAX_INDEX; i++) {
+        const derivedAddress = this.addressFromIndex(i);
+        if (derivedAddress === address) {
+          index = i;
+          break;
+        }
+      }
+      if (index === undefined) {
+        throw new Error(`Unknown address ${normalizedAddress}`);
+      }
+    }
+
     return `${this.#pairedDevice.hdPath}/${this.#pairedDevice.childrenPath
       .replace('*', index.toString())
       .replace(/\*/gu, '0')}`;
@@ -292,28 +305,14 @@ export class Device {
       return Number(cachedIndex);
     }
 
-    if (this.#pairedDevice.keyringMode === DeviceMode.ACCOUNT) {
-      const path = this.#pairedDevice.paths[address];
-      if (path === undefined) {
-        throw new Error(`Unknown address`);
-      }
-
-      const index = path.split('/').pop();
-      if (index === undefined) {
-        throw new Error(`Invalid path for address ${address}`);
-      }
-
-      return Number(index);
+    const index = this.pathFromAddress(address).split('/').pop();
+    if (index === undefined) {
+      throw new Error(`Invalid path for address ${address}`);
     }
 
-    for (let i = 0; i < MAX_INDEX; i++) {
-      const derivedAddress = this.addressFromIndex(i);
-      if (derivedAddress === address) {
-        return i;
-      }
-    }
+    this.#pairedDevice.indexes[address] = Number(index);
 
-    throw new Error(`Address ${address} not found`);
+    return Number(index);
   }
 
   /**

packages/keyring-eth-qr/src/qr-keyring.test.ts

@@ -1,6 +1,6 @@
 import { CryptoAccount, ETHSignature } from '@keystonehq/bc-ur-registry-eth';
 import { MetaMaskKeyring as KeystoneKeyring } from '@keystonehq/metamask-airgapped-keyring';
-import type { Hex } from '@metamask/utils';
+import { add0x, type Hex } from '@metamask/utils';
 import * as uuid from 'uuid';
 
 import type { QrKeyringBridge } from '.';
@@ -718,6 +718,18 @@ describe('QrKeyring', () => {
           expect(signedTx.nonce).toBe(LEGACY_TRANSACTION.nonce);
         });
 
+        it('throws an error if the address is not found in the keyring', async () => {
+          const keyring = new QrKeyring({
+            bridge: getMockBridge(),
+            ur,
+          });
+          const unknownAddress = add0x('0'.repeat(40));
+
+          await expect(
+            keyring.signTransaction(unknownAddress, TRANSACTION),
+          ).rejects.toThrow(`Unknown address ${unknownAddress}`);
+        });
+
         it('throws an error if the signature scan `requestId` is wrong', async () => {
           const keyring = new QrKeyring({
             bridge: getMockBridge(),