fix: fix bitbox02 number (#389)

RabbyHub · Dec 7, 2021 · 94a851d · 94a851d
1 parent 70e69f0
commit 94a851d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/background/service/keyring/eth-bitbox02-keyring.ts b/src/background/service/keyring/eth-bitbox02-keyring.ts
@@ -20,7 +20,7 @@ class BitBox02Keyring extends EventEmitter {
   accounts: string[] = [];
   hdk = new HDKey();
   page = 0;
-  perPage = 5;
+  perPage = 10;
   unlockedAccount = 0;
   paths = {};
   hdPath = '';
@@ -45,7 +45,7 @@ class BitBox02Keyring extends EventEmitter {
     this.hdPath = opts.hdPath || hdPathString;
     this.accounts = opts.accounts || [];
     this.page = opts.page || 0;
-    this.perPage = opts.perPage || 5;
+    this.perPage = 10;
     return Promise.resolve();
   }
 
@@ -162,7 +162,24 @@ class BitBox02Keyring extends EventEmitter {
         accounts.push({
           address,
           balance: null,
-          index: i,
+          index: i + 1,
+        });
+        this.paths[ethUtil.toChecksumAddress(address)] = i;
+      }
+      return accounts;
+    });
+  }
+  async getAddresses(start: number, end: number) {
+    const from = start;
+    const to = end;
+    const accounts: any[] = [];
+    return await this.withDevice(async () => {
+      for (let i = from; i < to; i++) {
+        const address = this._addressFromIndex(pathBase, i);
+        accounts.push({
+          address,
+          balance: null,
+          index: i + 1,
         });
         this.paths[ethUtil.toChecksumAddress(address)] = i;
       }

diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -338,6 +338,7 @@ export const BRAND_ALIAN_TYPE_TEXT = {
   [KEYRING_CLASS.HARDWARE.LEDGER]: 'Ledger',
   [KEYRING_CLASS.HARDWARE.TREZOR]: 'Trezor',
   [KEYRING_CLASS.HARDWARE.ONEKEY]: 'Onekey',
+  [KEYRING_CLASS.HARDWARE.BITBOX02]: 'BitBox02',
 };
 export const HARDWARE_KEYRING_TYPES = {
   BitBox02: {