@rabby-wallet/eth-hd-keyring 4.3.1 → 4.3.2-beta

package/dist/index.d.ts

@@ -107,7 +107,7 @@ declare class HdKeyring extends SimpleKeyring {
     getSeed(mnemonic: string, passphrase?: string): Uint8Array;
     slip39MnemonicToSeedSync(mnemonic: string, passphrase?: string): Uint8Array;
     static checkMnemonicIsSlip39(mnemonic: string): boolean;
-    static slip39DecodeMnemonics(shares: string[]): any;
+    static slip39GetThreshold(shares: string[]): number;
     static slip39DecodeMnemonic(share: string): any;
     static validateMnemonic(mnemonic: string): boolean;
 }

package/dist/index.js

@@ -333,7 +333,7 @@ var require_slip39_helper = __commonJS({
     function rs1024CreateChecksum(data, extendableBackupFlag) {
       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) {
@@ -2351,6 +2351,7 @@ var require_slip39 = __commonJS({
     };
     __publicField(_Slip39, "decodeMnemonics", slipHelper.decodeMnemonics);
     __publicField(_Slip39, "decodeMnemonic", slipHelper.decodeMnemonic);
+    __publicField(_Slip39, "combineMnemonics", slipHelper.combineMnemonics);
     var Slip39 = _Slip39;
     exports2 = module2.exports = Slip39;
   }
@@ -2674,14 +2675,29 @@ var _HdKeyring = class _HdKeyring extends import_eth_simple_keyring.default {
   static checkMnemonicIsSlip39(mnemonic) {
     const arr = mnemonic.split("\n");
     try {
-      _HdKeyring.slip39DecodeMnemonics(arr);
+      _HdKeyring.slip39GetThreshold(arr);
       return true;
     } catch (e) {
       return false;
     }
   }
-  static slip39DecodeMnemonics(shares) {
-    return import_slip39.default.decodeMnemonics(shares);
+  static slip39GetThreshold(shares) {
+    try {
+      import_slip39.default.combineMnemonics(shares);
+    } catch (e) {
+      const m1 = e.message.match(/The required number of groups is (\d+)/);
+      const m2 = e.message.match(/Expected (\d+) groups/);
+      const m3 = e.message.match(/Expected (\d+) mnemonics/);
+      if (m1) {
+        return parseInt(m1[1]);
+      } else if (m2) {
+        return parseInt(m2[1]);
+      } else if (m3) {
+        return parseInt(m3[1]);
+      }
+      throw new Error("Can't get threshold from error message");
+    }
+    return shares.length;
   }
   static slip39DecodeMnemonic(share) {
     return import_slip39.default.decodeMnemonic(share);

package/index.ts

@@ -413,15 +413,33 @@ class HdKeyring extends SimpleKeyring {
   static checkMnemonicIsSlip39(mnemonic: string) {
     const arr = mnemonic.split('\n');
     try {
-      HdKeyring.slip39DecodeMnemonics(arr);
+      HdKeyring.slip39GetThreshold(arr);
       return true;
     } catch (e) {
       return false;
     }
   }
 
-  static slip39DecodeMnemonics(shares: string[]) {
-    return slip39.decodeMnemonics(shares);
+  static slip39GetThreshold(shares: string[]) {
+    try {
+      slip39.combineMnemonics(shares);
+    } catch (e) {
+      const m1 = e.message.match(/The required number of groups is (\d+)/);
+      const m2 = e.message.match(/Expected (\d+) groups/);
+      const m3 = e.message.match(/Expected (\d+) mnemonics/);
+
+      if (m1) {
+        return parseInt(m1[1]);
+      } else if (m2) {
+        return parseInt(m2[1]);
+      } else if (m3) {
+        return parseInt(m3[1]);
+      }
+
+      throw new Error("Can't get threshold from error message");
+    }
+
+    return shares.length;
   }
 
   static slip39DecodeMnemonic(share: string) {

package/package.json

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

package/patches/slip39+0.1.9.patch

@@ -1,20 +1,22 @@
 diff --git a/node_modules/slip39/src/slip39.js b/node_modules/slip39/src/slip39.js
-index aff1c16..bd3ba54 100644
+index aff1c16..62fe490 100644
 --- a/node_modules/slip39/src/slip39.js
 +++ b/node_modules/slip39/src/slip39.js
-@@ -180,6 +180,10 @@ class Slip39 {
+@@ -180,6 +180,12 @@ class Slip39 {
      return slipHelper.validateMnemonic(mnemonic);
    }
  
 +  static decodeMnemonics = slipHelper.decodeMnemonics;
 +
 +  static decodeMnemonic = slipHelper.decodeMnemonic;
++
++  static combineMnemonics = slipHelper.combineMnemonics;
 +
    fromPath(path) {
      this.validatePath(path);
  
 diff --git a/node_modules/slip39/src/slip39_helper.js b/node_modules/slip39/src/slip39_helper.js
-index 8bcb956..e9b86e4 100644
+index 8bcb956..4b77568 100644
 --- a/node_modules/slip39/src/slip39_helper.js
 +++ b/node_modules/slip39/src/slip39_helper.js
 @@ -75,44 +75,21 @@ const SECRET_INDEX = 255;
@@ -128,7 +130,7 @@ index 8bcb956..e9b86e4 100644
      sharesValueLengths.values().next().value,
      () => 0,
    );
-@@ -400,10 +377,9 @@ function get_customization_string(extendableBackupFlag) {
+@@ -400,13 +377,11 @@ function get_customization_string(extendableBackupFlag) {
  }
  
  function rs1024CreateChecksum(data, extendableBackupFlag) {
@@ -139,9 +141,13 @@ index 8bcb956..e9b86e4 100644
 -    .concat(Array().slip39Generate(CHECKSUM_WORDS_LENGTH, () => 0));
 +    .concat(slip39Generate(CHECKSUM_WORDS_LENGTH, () => 0));
    const polymod = rs1024Polymod(values) ^ 1;
-   const result = Array()
-     .slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => (polymod >> (10 * i)) & 1023)
-@@ -414,9 +390,7 @@ function rs1024CreateChecksum(data, extendableBackupFlag) {
+-  const result = Array()
+-    .slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => (polymod >> (10 * i)) & 1023)
++  const result = slip39Generate(CHECKSUM_WORDS_LENGTH, (i) => (polymod >> (10 * i)) & 1023)
+     .reverse();
+ 
+   return result;
+@@ -414,9 +389,7 @@ function rs1024CreateChecksum(data, extendableBackupFlag) {
  
  function rs1024VerifyChecksum(data, extendableBackupFlag) {
    return (
@@ -152,7 +158,7 @@ index 8bcb956..e9b86e4 100644
          .concat(data),
      ) === 1
    );
-@@ -440,7 +414,7 @@ function intFromIndices(indices) {
+@@ -440,7 +413,7 @@ function intFromIndices(indices) {
  //
  function intToIndices(value, length, bits) {
    const mask = BigInt((1 << bits) - 1);
@@ -161,7 +167,7 @@ index 8bcb956..e9b86e4 100644
      parseInt((value >> (BigInt(i) * BigInt(bits))) & mask, 10),
    );
    return result.reverse();
-@@ -1886,4 +1860,6 @@ exports = module.exports = {
+@@ -1886,4 +1859,6 @@ exports = module.exports = {
    crypt,
    bitsToBytes,
    WORD_LIST,