Merge pull request #201 from KeystoneHQ/release

Release

Author: soralit

packages/metamask-keystone-usb-keyring/__tests__/KeystoneUSBKeyring.test.ts

@@ -27,7 +27,7 @@ describe("KeystoneUSBKeyring test", () => {
       const bridge = new KeystoneNodeUSBBridge();
       const keyring = new KeystoneUSBKeyring({ bridge });
       await keyring.init();
-      keyring.setHDPath(KEYSTONE_HD_PATH.LEDGER_LEGACY);
+      keyring.setHdPath(KEYSTONE_HD_PATH.LEDGER_LEGACY);
 
       console.log("keyring", await keyring.getFirstPage());
       console.log("keyring", await keyring.getNextPage());

packages/metamask-keystone-usb-keyring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keystonehq/metamask-keystone-usb-keyring",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "keystone usb eth keyring for metamask",
   "author": "aaronisme <aarondongchen@gmail.com>",
   "homepage": "https://github.com/KeystoneHQ/keystone-airgaped-base#readme",

packages/metamask-keystone-usb-keyring/src/KeystoneUSBKeyring.ts

@@ -119,33 +119,29 @@ export class KeystoneUSBKeyring {
   }
 
   async setUpBridge() {
-    if (!this.bridgeSetup) {
-      await this.bridge.init(this.xfp);
-      this.bridgeSetup = true;
-    }
+    await this.bridge.init(this.xfp);
   }
 
-  setHDPath(hdPath: string) {
+  setHdPath(hdPath: string) {
     this.hdPath = hdPath;
   }
 
   async readKeyring(): Promise<void> {
     await this.setUpBridge();
     const paths = ["m/44'/60'/0'"];
     paths.push(...Array.from({ length: 10 }, (_, i) => `m/44'/60'/${i}'/0/0`));
-    const results = [];
-    for (const path of paths) {
-      const result = await this.bridge.getKeys([path]);
-      results.push(result);
+    const result = await this.bridge.getKeys(paths);
+    if (result === undefined) {
+      throw new Error(`KeystoneError#getKeys.user_reject: user rejected the request`);
     }
-    this.xfp = results[0].mfp;
-    const keys = results.map((result) => {
-      const key = result.keys[0];
+    this.xfp = result.mfp;
+    const keys = result.keys.map((key) => {
       return {
         ...key,
         path: key.path.replace("m/", "").replace("M/", ""),
       };
     });
+
     const foundKey = keys.find((key) => key.path === "44'/60'/0'");
     this.hd_account = foundKey ? foundKey.xpub : "";
     const ledger_live_keys = keys.filter((key) => key.path !== "44'/60'/0'");

packages/metamask-keystone-usb-keyring/src/index.ts

@@ -1,3 +1,3 @@
-export { KeystoneUSBKeyring } from "./KeystoneUSBKeyring";
+export { KeystoneUSBKeyring, KEYSTONE_HD_PATH } from "./KeystoneUSBKeyring";
 export { KeystoneBridge } from "./KeystoneBridge";
 export { KeystoneUSBBridge } from "./KeystoneUSBBridge";