@rabby-wallet/eth-hd-keyring 3.6.8 → 3.6.11

package/dist/index.js

@@ -49,8 +49,10 @@ class HdKeyring extends eth_simple_keyring_1.default {
         this.wallets = [];
         this._index2wallet = {};
         this.activeIndexes = [];
+        this.index = 0;
         this.page = 0;
         this.perPage = 5;
+        this.byImport = false;
         this.deserialize(opts);
     }
     serialize() {
@@ -58,6 +60,8 @@ class HdKeyring extends eth_simple_keyring_1.default {
             mnemonic: this.mnemonic,
             activeIndexes: this.activeIndexes,
             hdPath: this.hdPath,
+            byImport: this.byImport,
+            index: this.index,
         });
     }
     deserialize(opts = {}) {
@@ -65,6 +69,8 @@ class HdKeyring extends eth_simple_keyring_1.default {
         this.mnemonic = null;
         this.root = null;
         this.hdPath = opts.hdPath || hdPathString;
+        this.byImport = !!opts.byImport;
+        this.index = opts.index || 0;
         if (opts.mnemonic) {
             this.initFromMnemonic(opts.mnemonic);
         }
@@ -137,6 +143,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

@@ -11,6 +11,8 @@ interface DeserializeOption {
   hdPath?: string;
   mnemonic?: string;
   activeIndexes?: number[];
+  byImport?: boolean;
+  index?: number;
 }
 
 class HdKeyring extends SimpleKeyring {
@@ -24,8 +26,10 @@ class HdKeyring extends SimpleKeyring {
   wallets: Wallet[] = [];
   _index2wallet: Record<number, [string, Wallet]> = {};
   activeIndexes: number[] = [];
+  index = 0;
   page = 0;
   perPage = 5;
+  byImport = false;
 
   /* PUBLIC METHODS */
   constructor(opts = {}) {
@@ -38,6 +42,8 @@ class HdKeyring extends SimpleKeyring {
       mnemonic: this.mnemonic,
       activeIndexes: this.activeIndexes,
       hdPath: this.hdPath,
+      byImport: this.byImport,
+      index: this.index,
     });
   }
 
@@ -46,6 +52,8 @@ class HdKeyring extends SimpleKeyring {
     this.mnemonic = null;
     this.root = null;
     this.hdPath = opts.hdPath || hdPathString;
+    this.byImport = !!opts.byImport;
+    this.index = opts.index || 0;
 
     if (opts.mnemonic) {
       this.initFromMnemonic(opts.mnemonic);
@@ -132,10 +140,14 @@ class HdKeyring extends SimpleKeyring {
     }
     return accounts;
   }
-  
-  async __getPage(
-    increment: number
-  ): Promise<
+
+  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;
       index: string;

package/package.json

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

package/test/index.js

@@ -57,7 +57,7 @@ describe('hd-keyring', function () {
   describe('#serialize empty wallets.', function () {
     it('serializes a new mnemonic', function () {
       keyring.serialize().then((output) => {
-        assert.equal(output.numberOfAccounts, 0);
+        // assert.equal(output.numberOfAccounts, 0);
         assert.equal(output.mnemonic, null);
       });
     });
@@ -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]);
+    });
+  });
 });