@keplr-wallet/crypto 0.10.1-rc.1 → 0.10.2

package/build/mnemonic.d.ts

@@ -7,4 +7,6 @@ export declare class Mnemonic {
     static validateMnemonic(mnemonic: string): void;
     static generateSeed(rng: RNG, strength?: number): Promise<string>;
     static generateWalletFromMnemonic(mnemonic: string, path?: string, password?: string): Uint8Array;
+    static generateMasterSeedFromMnemonic(mnemonic: string, password?: string): Uint8Array;
+    static generatePrivateKeyFromMasterSeed(seed: Uint8Array, path?: string): Uint8Array;
 }

package/build/mnemonic.js

@@ -14,6 +14,8 @@ exports.Mnemonic = void 0;
 const bip39 = require("bip39");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const bip32 = require("bip32");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const bs58check = require("bs58check");
 const buffer_1 = require("buffer/");
 class Mnemonic {
     static generateWallet(rng, path = `m/44'/118'/0'/0/0`, password = "", strength = 256) {
@@ -40,9 +42,23 @@ class Mnemonic {
         });
     }
     static generateWalletFromMnemonic(mnemonic, path = `m/44'/118'/0'/0/0`, password = "") {
+        const seed = bip39.mnemonicToSeedSync(mnemonic, password);
+        const masterSeed = bip32.fromSeed(seed);
+        const hd = masterSeed.derivePath(path);
+        const privateKey = hd.privateKey;
+        if (!privateKey) {
+            throw new Error("null hd key");
+        }
+        return privateKey;
+    }
+    static generateMasterSeedFromMnemonic(mnemonic, password = "") {
         const seed = bip39.mnemonicToSeedSync(mnemonic, password);
         const masterKey = bip32.fromSeed(seed);
-        const hd = masterKey.derivePath(path);
+        return buffer_1.Buffer.from(bs58check.decode(masterKey.toBase58()));
+    }
+    static generatePrivateKeyFromMasterSeed(seed, path = `m/44'/118'/0'/0/0`) {
+        const masterSeed = bip32.fromBase58(bs58check.encode(seed));
+        const hd = masterSeed.derivePath(path);
         const privateKey = hd.privateKey;
         if (!privateKey) {
             throw new Error("null hd key");

package/build/mnemonic.js.map

@@ -1 +1 @@
-{"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../src/mnemonic.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,oCAAiC;AAmBjC,MAAa,QAAQ;IACnB,MAAM,CAAO,cAAc,CACzB,GAAQ,EACR,OAAe,mBAAmB,EAClC,WAAmB,EAAE,EACrB,WAAmB,GAAG;;YAEtB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,0BAA0B,CACjD,QAAQ,EACR,IAAI,EACJ,QAAQ,CACT,CAAC;YAEF,OAAO;gBACL,OAAO;gBACP,QAAQ;aACT,CAAC;QACJ,CAAC;KAAA;IAED,MAAM,CAAC,gBAAgB,CAAC,QAAgB;QACtC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAO,YAAY,CAAC,GAAQ,EAAE,WAAmB,GAAG;;YACxD,IAAI,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE;gBACvB,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;aACxC;YACD,IAAI,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YACzC,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,KAAK,CAAC,iBAAiB,CAAC,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,CAAC;KAAA;IAED,MAAM,CAAC,0BAA0B,CAC/B,QAAgB,EAChB,OAAe,mBAAmB,EAClC,WAAmB,EAAE;QAErB,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;SAChC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAhDD,4BAgDC"}
+{"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../src/mnemonic.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,8DAA8D;AAC9D,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEvC,oCAAiC;AAmBjC,MAAa,QAAQ;IACnB,MAAM,CAAO,cAAc,CACzB,GAAQ,EACR,OAAe,mBAAmB,EAClC,WAAmB,EAAE,EACrB,WAAmB,GAAG;;YAEtB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,0BAA0B,CACjD,QAAQ,EACR,IAAI,EACJ,QAAQ,CACT,CAAC;YAEF,OAAO;gBACL,OAAO;gBACP,QAAQ;aACT,CAAC;QACJ,CAAC;KAAA;IAED,MAAM,CAAC,gBAAgB,CAAC,QAAgB;QACtC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAO,YAAY,CAAC,GAAQ,EAAE,WAAmB,GAAG;;YACxD,IAAI,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE;gBACvB,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;aACxC;YACD,IAAI,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YACzC,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,KAAK,CAAC,iBAAiB,CAAC,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,CAAC;KAAA;IAED,MAAM,CAAC,0BAA0B,CAC/B,QAAgB,EAChB,OAAe,mBAAmB,EAClC,WAAmB,EAAE;QAErB,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;SAChC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,8BAA8B,CACnC,QAAgB,EAChB,WAAmB,EAAE;QAErB,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEvC,OAAO,eAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,gCAAgC,CACrC,IAAgB,EAChB,OAAe,mBAAmB;QAElC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,MAAM,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;SAChC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAxED,4BAwEC"}

package/build/mnemonic.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/mnemonic.spec.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mnemonic_1 = require("./mnemonic");
+const key_1 = require("./key");
+describe("Test gen key from mnemonic", () => {
+    it("mnemonic should generate proper priv key", () => {
+        const mnemonic = "celery husband drama unaware blue empower jelly twist program say prepare page";
+        let privKey = new key_1.PrivKeySecp256k1(mnemonic_1.Mnemonic.generateWalletFromMnemonic(mnemonic));
+        let pubKey = privKey.getPubKey();
+        expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe("02394bc53633366a2ab9b5d697a94c8c0121cc5e3f0d554a63167edb318ceae8bc");
+        const masterSeed = mnemonic_1.Mnemonic.generateMasterSeedFromMnemonic(mnemonic);
+        privKey = new key_1.PrivKeySecp256k1(mnemonic_1.Mnemonic.generatePrivateKeyFromMasterSeed(masterSeed));
+        pubKey = privKey.getPubKey();
+        expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe("02394bc53633366a2ab9b5d697a94c8c0121cc5e3f0d554a63167edb318ceae8bc");
+    });
+    it("mnemonic should generate proper priv key 2", () => {
+        const mnemonic = "celery husband drama unaware blue empower jelly twist program say prepare page";
+        let privKey = new key_1.PrivKeySecp256k1(mnemonic_1.Mnemonic.generateWalletFromMnemonic(mnemonic, "m/44'/118'/1'/0/0"));
+        let pubKey = privKey.getPubKey();
+        expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe("03270e75d7e43f57643cd661bc1a0a3b939b786bbcdec1b82b718fd628e947eec1");
+        const masterSeed = mnemonic_1.Mnemonic.generateMasterSeedFromMnemonic(mnemonic);
+        privKey = new key_1.PrivKeySecp256k1(mnemonic_1.Mnemonic.generatePrivateKeyFromMasterSeed(masterSeed, "m/44'/118'/1'/0/0"));
+        pubKey = privKey.getPubKey();
+        expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe("03270e75d7e43f57643cd661bc1a0a3b939b786bbcdec1b82b718fd628e947eec1");
+    });
+});
+//# sourceMappingURL=mnemonic.spec.js.map

package/build/mnemonic.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mnemonic.spec.js","sourceRoot":"","sources":["../src/mnemonic.spec.ts"],"names":[],"mappings":";;AAAA,yCAAsC;AACtC,+BAAyC;AAEzC,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,QAAQ,GACZ,gFAAgF,CAAC;QAEnF,IAAI,OAAO,GAAG,IAAI,sBAAgB,CAChC,mBAAQ,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAC9C,CAAC;QACF,IAAI,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACxD,oEAAoE,CACrE,CAAC;QAEF,MAAM,UAAU,GAAG,mBAAQ,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;QACrE,OAAO,GAAG,IAAI,sBAAgB,CAC5B,mBAAQ,CAAC,gCAAgC,CAAC,UAAU,CAAC,CACtD,CAAC;QACF,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACxD,oEAAoE,CACrE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,QAAQ,GACZ,gFAAgF,CAAC;QAEnF,IAAI,OAAO,GAAG,IAAI,sBAAgB,CAChC,mBAAQ,CAAC,0BAA0B,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CACnE,CAAC;QACF,IAAI,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACxD,oEAAoE,CACrE,CAAC;QAEF,MAAM,UAAU,GAAG,mBAAQ,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;QACrE,OAAO,GAAG,IAAI,sBAAgB,CAC5B,mBAAQ,CAAC,gCAAgC,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAC3E,CAAC;QACF,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACxD,oEAAoE,CACrE,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/crypto",
-  "version": "0.10.1-rc.1",
+  "version": "0.10.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -24,10 +24,11 @@
   "dependencies": {
     "bip32": "^2.0.6",
     "bip39": "^3.0.3",
+    "bs58check": "^2.1.2",
     "buffer": "^6.0.3",
     "crypto-js": "^4.0.0",
     "elliptic": "^6.5.3",
     "sha.js": "^2.4.11"
   },
-  "gitHead": "34305bdbb703c6d4267ec597f50c9cfe31adafca"
+  "gitHead": "c6ea69512ee7487fe3dcd9ce89f928a96dbf44a2"
 }

package/src/mnemonic.spec.ts

@@ -0,0 +1,48 @@
+import { Mnemonic } from "./mnemonic";
+import { PrivKeySecp256k1 } from "./key";
+
+describe("Test gen key from mnemonic", () => {
+  it("mnemonic should generate proper priv key", () => {
+    const mnemonic =
+      "celery husband drama unaware blue empower jelly twist program say prepare page";
+
+    let privKey = new PrivKeySecp256k1(
+      Mnemonic.generateWalletFromMnemonic(mnemonic)
+    );
+    let pubKey = privKey.getPubKey();
+    expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe(
+      "02394bc53633366a2ab9b5d697a94c8c0121cc5e3f0d554a63167edb318ceae8bc"
+    );
+
+    const masterSeed = Mnemonic.generateMasterSeedFromMnemonic(mnemonic);
+    privKey = new PrivKeySecp256k1(
+      Mnemonic.generatePrivateKeyFromMasterSeed(masterSeed)
+    );
+    pubKey = privKey.getPubKey();
+    expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe(
+      "02394bc53633366a2ab9b5d697a94c8c0121cc5e3f0d554a63167edb318ceae8bc"
+    );
+  });
+
+  it("mnemonic should generate proper priv key 2", () => {
+    const mnemonic =
+      "celery husband drama unaware blue empower jelly twist program say prepare page";
+
+    let privKey = new PrivKeySecp256k1(
+      Mnemonic.generateWalletFromMnemonic(mnemonic, "m/44'/118'/1'/0/0")
+    );
+    let pubKey = privKey.getPubKey();
+    expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe(
+      "03270e75d7e43f57643cd661bc1a0a3b939b786bbcdec1b82b718fd628e947eec1"
+    );
+
+    const masterSeed = Mnemonic.generateMasterSeedFromMnemonic(mnemonic);
+    privKey = new PrivKeySecp256k1(
+      Mnemonic.generatePrivateKeyFromMasterSeed(masterSeed, "m/44'/118'/1'/0/0")
+    );
+    pubKey = privKey.getPubKey();
+    expect(Buffer.from(pubKey.toBytes()).toString("hex")).toBe(
+      "03270e75d7e43f57643cd661bc1a0a3b939b786bbcdec1b82b718fd628e947eec1"
+    );
+  });
+});

package/src/mnemonic.ts

@@ -2,6 +2,8 @@
 const bip39 = require("bip39");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const bip32 = require("bip32");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const bs58check = require("bs58check");
 
 import { Buffer } from "buffer/";
 
@@ -59,10 +61,34 @@ export class Mnemonic {
     mnemonic: string,
     path: string = `m/44'/118'/0'/0/0`,
     password: string = ""
+  ): Uint8Array {
+    const seed = bip39.mnemonicToSeedSync(mnemonic, password);
+    const masterSeed = bip32.fromSeed(seed);
+    const hd = masterSeed.derivePath(path);
+
+    const privateKey = hd.privateKey;
+    if (!privateKey) {
+      throw new Error("null hd key");
+    }
+    return privateKey;
+  }
+
+  static generateMasterSeedFromMnemonic(
+    mnemonic: string,
+    password: string = ""
   ): Uint8Array {
     const seed = bip39.mnemonicToSeedSync(mnemonic, password);
     const masterKey = bip32.fromSeed(seed);
-    const hd = masterKey.derivePath(path);
+
+    return Buffer.from(bs58check.decode(masterKey.toBase58()));
+  }
+
+  static generatePrivateKeyFromMasterSeed(
+    seed: Uint8Array,
+    path: string = `m/44'/118'/0'/0/0`
+  ): Uint8Array {
+    const masterSeed = bip32.fromBase58(bs58check.encode(seed));
+    const hd = masterSeed.derivePath(path);
 
     const privateKey = hd.privateKey;
     if (!privateKey) {