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

package/dist/index.js

@@ -45,6 +45,7 @@ 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) => {
@@ -99,38 +100,20 @@ var require_slip39_helper = __commonJS({
     var ROUND_COUNT = 4;
     var DIGEST_INDEX = 254;
     var SECRET_INDEX = 255;
-    String.prototype.slip39EncodeHex = function() {
+    var slip39EncodeHex = function(str) {
       let bytes = [];
-      for (let i = 0; i < this.length; ++i) {
-        bytes.push(this.charCodeAt(i));
+      for (let i = 0; i < str.length; ++i) {
+        bytes.push(str.charCodeAt(i));
       }
       return bytes;
     };
-    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;
+    var slip39Generate = function(m, v = (_) => _) {
+      let n = m;
+      const arr = [];
       for (let i = 0; i < n; i++) {
-        this[i] = v(i);
+        arr[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 this;
+      return arr;
     };
     var BIGINT_WORD_BITS = BigInt(8);
     function decodeBigInt(bytes) {
@@ -196,9 +179,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 = passphrase.slip39EncodeHex();
+      const pwd = slip39EncodeHex(passphrase);
       const salt = getSalt(identifier, extendableBackupFlag);
-      let range = Array().slip39Generate(ROUND_COUNT);
+      let range = slip39Generate(ROUND_COUNT);
       range = encrypt ? range : range.reverse();
       range.forEach((round) => {
         const f = roundFunction(round, pwd, iterationExponent, salt, IR);
@@ -232,7 +215,7 @@ var require_slip39_helper = __commonJS({
         );
       }
       if (threshold === 1) {
-        return Array().slip39Generate(shareCount, () => sharedSecret);
+        return slip39Generate(shareCount, () => sharedSecret);
       }
       const randomShareCount = threshold - 2;
       const randomPart = randomBytes(sharedSecret.length - DIGEST_LENGTH);
@@ -240,7 +223,7 @@ var require_slip39_helper = __commonJS({
       let baseShares = /* @__PURE__ */ new Map();
       let shares = [];
       if (randomShareCount) {
-        shares = Array().slip39Generate(
+        shares = slip39Generate(
           randomShareCount,
           () => randomBytes(sharedSecret.length)
         );
@@ -269,13 +252,13 @@ var require_slip39_helper = __commonJS({
           `Invalid padding in mnemonic or insufficient length of mnemonics (${a.length} or ${b.length})`
         );
       }
-      return Array().slip39Generate(a.length, (i) => a[i] ^ b[i]);
+      return slip39Generate(a.length, (i) => a[i] ^ b[i]);
     }
     function getSalt(identifier, extendableBackupFlag) {
       if (extendableBackupFlag) {
         return [];
       } else {
-        const salt = CUSTOMIZATION_STRING_NON_EXTENDABLE.slip39EncodeHex();
+        const salt = slip39EncodeHex(CUSTOMIZATION_STRING_NON_EXTENDABLE);
         return salt.concat(identifier);
       }
     }
@@ -299,7 +282,7 @@ var require_slip39_helper = __commonJS({
       shares.forEach((v, k) => {
         logProd = logProd + LOG_TABLE[k ^ x];
       });
-      let results = Array().slip39Generate(
+      let results = slip39Generate(
         sharesValueLengths.values().next().value,
         () => 0
       );
@@ -348,14 +331,14 @@ var require_slip39_helper = __commonJS({
       return extendableBackupFlag ? CUSTOMIZATION_STRING_EXTENDABLE : CUSTOMIZATION_STRING_NON_EXTENDABLE;
     }
     function rs1024CreateChecksum(data, extendableBackupFlag) {
-      const values = get_customization_string(extendableBackupFlag).slip39EncodeHex().concat(data).concat(Array().slip39Generate(CHECKSUM_WORDS_LENGTH, () => 0));
+      const values = slip39EncodeHex(get_customization_string(extendableBackupFlag)).concat(data).concat(slip39Generate(CHECKSUM_WORDS_LENGTH, () => 0));
       const polymod = rs1024Polymod(values) ^ 1;
-      const result = Array().slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => polymod >> 10 * i & 1023).reverse();
+      const result = slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => polymod >> 10 * i & 1023).reverse();
       return result;
     }
     function rs1024VerifyChecksum(data, extendableBackupFlag) {
       return rs1024Polymod(
-        get_customization_string(extendableBackupFlag).slip39EncodeHex().concat(data)
+        slip39EncodeHex(get_customization_string(extendableBackupFlag)).concat(data)
       ) === 1;
     }
     function intFromIndices(indices) {
@@ -368,7 +351,7 @@ var require_slip39_helper = __commonJS({
     }
     function intToIndices(value, length, bits) {
       const mask = BigInt((1 << bits) - 1);
-      const result = Array().slip39Generate(
+      const result = slip39Generate(
         length,
         (i) => parseInt(value >> BigInt(i) * BigInt(bits) & mask, 10)
       );
@@ -2180,7 +2163,9 @@ var require_slip39_helper = __commonJS({
       combineMnemonics,
       crypt,
       bitsToBytes,
-      WORD_LIST
+      WORD_LIST,
+      decodeMnemonics,
+      decodeMnemonic
     };
   }
 });
@@ -2207,7 +2192,7 @@ var require_slip39 = __commonJS({
         return result;
       }
     };
-    var Slip39 = class _Slip39 {
+    var _Slip39 = class _Slip39 {
       constructor({
         iterationExponent = 0,
         extendableBackupFlag = 0,
@@ -2364,6 +2349,10 @@ 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;
   }
 });
@@ -2429,6 +2418,7 @@ var _HdKeyring = class _HdKeyring extends import_eth_simple_keyring.default {
     this.deserialize(opts);
   }
   serialize() {
+    var _a;
     return Promise.resolve({
       mnemonic: this.mnemonic,
       /**
@@ -2437,7 +2427,7 @@ var _HdKeyring = class _HdKeyring extends import_eth_simple_keyring.default {
       activeIndexes: this.activeIndexes,
       hdPath: this.hdPath,
       byImport: this.byImport,
-      hasBackup: this.hasBackup,
+      hasBackup: (_a = this.hasBackup) != null ? _a : true,
       index: this.index,
       needPassphrase: this.needPassphrase,
       accounts: this.accounts,
@@ -2447,12 +2437,12 @@ var _HdKeyring = class _HdKeyring extends import_eth_simple_keyring.default {
     });
   }
   deserialize(opts = {}) {
+    var _a;
     this.wallets = [];
     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.hasBackup = (_a = opts.hasBackup) != null ? _a : true;
     this.index = opts.index || 0;
     this.needPassphrase = opts.needPassphrase || !!opts.passphrase;
     this.passphrase = opts.passphrase;

package/index.ts

@@ -96,7 +96,7 @@ class HdKeyring extends SimpleKeyring {
       activeIndexes: this.activeIndexes,
       hdPath: this.hdPath,
       byImport: this.byImport,
-      hasBackup: this.hasBackup,
+      hasBackup: this.hasBackup ?? true,
       index: this.index,
       needPassphrase: this.needPassphrase,
       accounts: this.accounts,
@@ -111,8 +111,7 @@ 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.hasBackup = opts.hasBackup ?? true;
     this.index = opts.index || 0;
     this.needPassphrase = opts.needPassphrase || !!opts.passphrase;
     this.passphrase = opts.passphrase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/eth-hd-keyring",
-  "version": "4.3.3-1",
+  "version": "4.3.3-3",
   "description": "A simple standard interface for a seed phrase generated set of Ethereum accounts.",
   "keywords": [
     "ethereum",
@@ -24,7 +24,8 @@
     "lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' '**/*.yml' --ignore-path .gitignore",
     "lint": "yarn lint:eslint && yarn lint:misc --check",
     "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
-    "test": "yarn build && mocha"
+    "test": "yarn build && mocha",
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@ethereumjs/util": "^9.0.0",
@@ -64,8 +65,10 @@
   "lavamoat": {
     "allowScripts": {
       "@lavamoat/preinstall-always-fail": false,
+      "@rabby-wallet/eth-hd-keyring": true,
       "keccak": false,
-      "secp256k1": false
+      "secp256k1": false,
+      "esbuild": false
     }
   },
   "tsup": {