@rabby-wallet/eth-hd-keyring 3.6.10 → 3.6.12

package/dist/index.js

@@ -53,6 +53,7 @@ class HdKeyring extends eth_simple_keyring_1.default {
         this.page = 0;
         this.perPage = 5;
         this.byImport = false;
+        this.publicKey = '';
         this.deserialize(opts);
     }
     serialize() {
@@ -62,6 +63,7 @@ class HdKeyring extends eth_simple_keyring_1.default {
             hdPath: this.hdPath,
             byImport: this.byImport,
             index: this.index,
+            publicKey: this.publicKey,
         });
     }
     deserialize(opts = {}) {
@@ -71,6 +73,7 @@ class HdKeyring extends eth_simple_keyring_1.default {
         this.hdPath = opts.hdPath || hdPathString;
         this.byImport = !!opts.byImport;
         this.index = opts.index || 0;
+        this.publicKey = opts.publicKey || '';
         if (opts.mnemonic) {
             this.initFromMnemonic(opts.mnemonic);
         }
@@ -79,12 +82,23 @@ class HdKeyring extends eth_simple_keyring_1.default {
         }
         return Promise.resolve([]);
     }
+    initPublicKey() {
+        this.root = this.hdWallet.derivePath(this.hdPath);
+        const wallet = this.root.getWallet();
+        this.publicKey = wallet.getPublicKey().toString('hex');
+    }
+    getPublicKey() {
+        return this.publicKey;
+    }
     initFromMnemonic(mnemonic) {
         this.mnemonic = mnemonic;
         this._index2wallet = {};
         const seed = bip39.mnemonicToSeedSync(mnemonic);
         this.hdWallet = ethereumjs_wallet_1.hdkey.fromMasterSeed(seed);
         this.root = this.hdWallet.derivePath(this.hdPath);
+        if (!this.publicKey) {
+            this.initPublicKey();
+        }
     }
     addAccounts(numberOfAccounts = 1) {
         if (!this.root) {
@@ -143,6 +157,11 @@ class HdKeyring extends eth_simple_keyring_1.default {
         }
         return accounts;
     }
+    removeAccount(address) {
+        super.removeAccount(address);
+        const index = this.getIndexByAddress(address);
+        this.activeIndexes = this.activeIndexes.filter((i) => i !== index);
+    }
     __getPage(increment) {
         return __awaiter(this, void 0, void 0, function* () {
             this.page += increment;

package/index.ts

@@ -13,6 +13,7 @@ interface DeserializeOption {
   activeIndexes?: number[];
   byImport?: boolean;
   index?: number;
+  publicKey?: string;
 }
 
 class HdKeyring extends SimpleKeyring {
@@ -30,6 +31,7 @@ class HdKeyring extends SimpleKeyring {
   page = 0;
   perPage = 5;
   byImport = false;
+  publicKey: string = '';
 
   /* PUBLIC METHODS */
   constructor(opts = {}) {
@@ -44,6 +46,7 @@ class HdKeyring extends SimpleKeyring {
       hdPath: this.hdPath,
       byImport: this.byImport,
       index: this.index,
+      publicKey: this.publicKey,
     });
   }
 
@@ -54,6 +57,7 @@ class HdKeyring extends SimpleKeyring {
     this.hdPath = opts.hdPath || hdPathString;
     this.byImport = !!opts.byImport;
     this.index = opts.index || 0;
+    this.publicKey = opts.publicKey || '';
 
     if (opts.mnemonic) {
       this.initFromMnemonic(opts.mnemonic);
@@ -66,12 +70,26 @@ class HdKeyring extends SimpleKeyring {
     return Promise.resolve([]);
   }
 
+  private initPublicKey() {
+    this.root = this.hdWallet!.derivePath(this.hdPath);
+    const wallet = this.root.getWallet();
+    this.publicKey = wallet.getPublicKey().toString('hex');
+  }
+
+  getPublicKey() {
+    return this.publicKey;
+  }
+
   initFromMnemonic(mnemonic) {
     this.mnemonic = mnemonic;
     this._index2wallet = {};
     const seed = bip39.mnemonicToSeedSync(mnemonic);
     this.hdWallet = hdkey.fromMasterSeed(seed);
     this.root = this.hdWallet!.derivePath(this.hdPath);
+
+    if (!this.publicKey) {
+      this.initPublicKey();
+    }
   }
 
   addAccounts(numberOfAccounts = 1) {
@@ -141,6 +159,12 @@ class HdKeyring extends SimpleKeyring {
     return accounts;
   }
 
+  removeAccount(address) {
+    super.removeAccount(address);
+    const index = this.getIndexByAddress(address);
+    this.activeIndexes = this.activeIndexes.filter((i) => i !== index);
+  }
+
   async __getPage(increment: number): Promise<
     Array<{
       address: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/eth-hd-keyring",
-  "version": "3.6.10",
+  "version": "3.6.12",
   "description": "A simple standard interface for a seed phrase generated set of Ethereum accounts.",
   "keywords": [
     "ethereum",

package/test/index.js

@@ -507,4 +507,20 @@ describe('hd-keyring', function () {
         });
     });
   });
+
+  describe('removeAccount', function () {
+    it('should return correct activeIndexes', async function () {
+      const address = firstAcct;
+
+      keyring = new HdKeyring({
+        mnemonic: sampleMnemonic,
+        activeIndexes: [0, 2, 3, 6],
+      });
+      await keyring.removeAccount(address);
+      const { activeIndexes } = await keyring.serialize();
+
+      assert.equal(activeIndexes.length, 3);
+      assert.deepEqual(activeIndexes, [2, 3, 6]);
+    });
+  });
 });