@rabby-wallet/eth-hd-keyring 4.3.2 → 4.3.3-1

package/dist/index.d.ts

@@ -15,6 +15,7 @@ interface DeserializeOption {
     mnemonic: string;
     activeIndexes?: number[];
     byImport?: boolean;
+    hasBackup?: boolean;
     index?: number;
     passphrase?: string;
     needPassphrase?: boolean;
@@ -41,6 +42,7 @@ declare class HdKeyring extends SimpleKeyring {
     page: number;
     perPage: number;
     byImport: boolean;
+    hasBackup?: boolean;
     publicKey: string;
     needPassphrase: boolean;
     accounts: string[];
@@ -56,6 +58,7 @@ declare class HdKeyring extends SimpleKeyring {
         activeIndexes: number[];
         hdPath: string;
         byImport: boolean;
+        hasBackup: boolean;
         index: number;
         needPassphrase: boolean;
         accounts: string[];

package/dist/index.js

@@ -45,7 +45,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -100,20 +99,38 @@ var require_slip39_helper = __commonJS({
     var ROUND_COUNT = 4;
     var DIGEST_INDEX = 254;
     var SECRET_INDEX = 255;
-    var slip39EncodeHex = function(str) {
+    String.prototype.slip39EncodeHex = function() {
       let bytes = [];
-      for (let i = 0; i < str.length; ++i) {
-        bytes.push(str.charCodeAt(i));
+      for (let i = 0; i < this.length; ++i) {
+        bytes.push(this.charCodeAt(i));
       }
       return bytes;
     };
-    var slip39Generate = function(m, v = (_) => _) {
-      let n = m;
-      const arr = [];
+    Array.prototype.slip39DecodeHex = function() {
+      let str = [];
+      const hex = this.toString().split(",");
+      for (let i = 0; i < hex.length; i++) {
+        str.push(String.fromCharCode(hex[i]));
+      }
+      return str.toString().replace(/,/g, "");
+    };
+    Array.prototype.slip39Generate = function(m, v = (_) => _) {
+      let n = m || this.length;
       for (let i = 0; i < n; i++) {
-        arr[i] = v(i);
+        this[i] = v(i);
+      }
+      return this;
+    };
+    Array.prototype.toHexString = function() {
+      return Array.prototype.map.call(this, function(byte) {
+        return ("0" + (byte & 255).toString(16)).slice(-2);
+      }).join("");
+    };
+    Array.prototype.toByteArray = function(hexString) {
+      for (let i = 0; i < hexString.length; i = i + 2) {
+        this.push(parseInt(hexString.substr(i, 2), 16));
       }
-      return arr;
+      return this;
     };
     var BIGINT_WORD_BITS = BigInt(8);
     function decodeBigInt(bytes) {
@@ -179,9 +196,9 @@ var require_slip39_helper = __commonJS({
       }
       let IL = masterSecret.slice().slice(0, masterSecret.length / 2);
       let IR = masterSecret.slice().slice(masterSecret.length / 2);
-      const pwd = slip39EncodeHex(passphrase);
+      const pwd = passphrase.slip39EncodeHex();
       const salt = getSalt(identifier, extendableBackupFlag);
-      let range = slip39Generate(ROUND_COUNT);
+      let range = Array().slip39Generate(ROUND_COUNT);
       range = encrypt ? range : range.reverse();
       range.forEach((round) => {
         const f = roundFunction(round, pwd, iterationExponent, salt, IR);
@@ -215,7 +232,7 @@ var require_slip39_helper = __commonJS({
         );
       }
       if (threshold === 1) {
-        return slip39Generate(shareCount, () => sharedSecret);
+        return Array().slip39Generate(shareCount, () => sharedSecret);
       }
       const randomShareCount = threshold - 2;
       const randomPart = randomBytes(sharedSecret.length - DIGEST_LENGTH);
@@ -223,7 +240,7 @@ var require_slip39_helper = __commonJS({
       let baseShares = /* @__PURE__ */ new Map();
       let shares = [];
       if (randomShareCount) {
-        shares = slip39Generate(
+        shares = Array().slip39Generate(
           randomShareCount,
           () => randomBytes(sharedSecret.length)
         );
@@ -252,13 +269,13 @@ var require_slip39_helper = __commonJS({
           `Invalid padding in mnemonic or insufficient length of mnemonics (${a.length} or ${b.length})`
         );
       }
-      return slip39Generate(a.length, (i) => a[i] ^ b[i]);
+      return Array().slip39Generate(a.length, (i) => a[i] ^ b[i]);
     }
     function getSalt(identifier, extendableBackupFlag) {
       if (extendableBackupFlag) {
         return [];
       } else {
-        const salt = slip39EncodeHex(CUSTOMIZATION_STRING_NON_EXTENDABLE);
+        const salt = CUSTOMIZATION_STRING_NON_EXTENDABLE.slip39EncodeHex();
         return salt.concat(identifier);
       }
     }
@@ -282,7 +299,7 @@ var require_slip39_helper = __commonJS({
       shares.forEach((v, k) => {
         logProd = logProd + LOG_TABLE[k ^ x];
       });
-      let results = slip39Generate(
+      let results = Array().slip39Generate(
         sharesValueLengths.values().next().value,
         () => 0
       );
@@ -331,14 +348,14 @@ var require_slip39_helper = __commonJS({
       return extendableBackupFlag ? CUSTOMIZATION_STRING_EXTENDABLE : CUSTOMIZATION_STRING_NON_EXTENDABLE;
     }
     function rs1024CreateChecksum(data, extendableBackupFlag) {
-      const values = slip39EncodeHex(get_customization_string(extendableBackupFlag)).concat(data).concat(slip39Generate(CHECKSUM_WORDS_LENGTH, () => 0));
+      const values = get_customization_string(extendableBackupFlag).slip39EncodeHex().concat(data).concat(Array().slip39Generate(CHECKSUM_WORDS_LENGTH, () => 0));
       const polymod = rs1024Polymod(values) ^ 1;
-      const result = slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => polymod >> 10 * i & 1023).reverse();
+      const result = Array().slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => polymod >> 10 * i & 1023).reverse();
       return result;
     }
     function rs1024VerifyChecksum(data, extendableBackupFlag) {
       return rs1024Polymod(
-        slip39EncodeHex(get_customization_string(extendableBackupFlag)).concat(data)
+        get_customization_string(extendableBackupFlag).slip39EncodeHex().concat(data)
       ) === 1;
     }
     function intFromIndices(indices) {
@@ -351,7 +368,7 @@ var require_slip39_helper = __commonJS({
     }
     function intToIndices(value, length, bits) {
       const mask = BigInt((1 << bits) - 1);
-      const result = slip39Generate(
+      const result = Array().slip39Generate(
         length,
         (i) => parseInt(value >> BigInt(i) * BigInt(bits) & mask, 10)
       );
@@ -2163,9 +2180,7 @@ var require_slip39_helper = __commonJS({
       combineMnemonics,
       crypt,
       bitsToBytes,
-      WORD_LIST,
-      decodeMnemonics,
-      decodeMnemonic
+      WORD_LIST
     };
   }
 });
@@ -2192,7 +2207,7 @@ var require_slip39 = __commonJS({
         return result;
       }
     };
-    var _Slip39 = class _Slip39 {
+    var Slip39 = class _Slip39 {
       constructor({
         iterationExponent = 0,
         extendableBackupFlag = 0,
@@ -2349,10 +2364,6 @@ var require_slip39 = __commonJS({
         return result;
       }
     };
-    __publicField(_Slip39, "decodeMnemonics", slipHelper.decodeMnemonics);
-    __publicField(_Slip39, "decodeMnemonic", slipHelper.decodeMnemonic);
-    __publicField(_Slip39, "combineMnemonics", slipHelper.combineMnemonics);
-    var Slip39 = _Slip39;
     exports2 = module2.exports = Slip39;
   }
 });
@@ -2426,6 +2437,7 @@ var _HdKeyring = class _HdKeyring extends import_eth_simple_keyring.default {
       activeIndexes: this.activeIndexes,
       hdPath: this.hdPath,
       byImport: this.byImport,
+      hasBackup: this.hasBackup,
       index: this.index,
       needPassphrase: this.needPassphrase,
       accounts: this.accounts,
@@ -2439,6 +2451,8 @@ var _HdKeyring = class _HdKeyring extends import_eth_simple_keyring.default {
     this.mnemonic = null;
     this.hdPath = opts.hdPath || HD_PATH_BASE["BIP44" /* BIP44 */];
     this.byImport = !!opts.byImport;
+    this.hasBackup = opts.hasBackup;
+    console.log("opts.index", opts);
     this.index = opts.index || 0;
     this.needPassphrase = opts.needPassphrase || !!opts.passphrase;
     this.passphrase = opts.passphrase;

package/index.ts

@@ -43,6 +43,7 @@ interface DeserializeOption {
   mnemonic: string;
   activeIndexes?: number[];
   byImport?: boolean;
+  hasBackup?: boolean;
   index?: number;
   passphrase?: string;
   needPassphrase?: boolean;
@@ -72,6 +73,7 @@ class HdKeyring extends SimpleKeyring {
   page = 0;
   perPage = 5;
   byImport = false;
+  hasBackup?: boolean;
   publicKey: string = '';
   needPassphrase = false;
   accounts: string[] = [];
@@ -94,6 +96,7 @@ class HdKeyring extends SimpleKeyring {
       activeIndexes: this.activeIndexes,
       hdPath: this.hdPath,
       byImport: this.byImport,
+      hasBackup: this.hasBackup,
       index: this.index,
       needPassphrase: this.needPassphrase,
       accounts: this.accounts,
@@ -108,6 +111,8 @@ class HdKeyring extends SimpleKeyring {
     this.mnemonic = null;
     this.hdPath = opts.hdPath || HD_PATH_BASE[HDPathType.BIP44];
     this.byImport = !!opts.byImport;
+    this.hasBackup = opts.hasBackup;
+    console.log('opts.index', opts);
     this.index = opts.index || 0;
     this.needPassphrase = opts.needPassphrase || !!opts.passphrase;
     this.passphrase = opts.passphrase;
@@ -115,7 +120,6 @@ class HdKeyring extends SimpleKeyring {
     this.accountDetails = opts.accountDetails || {};
     this.publicKey = opts.publicKey || '';
     this.isSlip39 = opts.isSlip39 || false;
-
     if (opts.mnemonic) {
       this.mnemonic = opts.mnemonic;
       this.setPassphrase(opts.passphrase || '');

package/package.json

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