@keplr-wallet/crypto 0.12.0-alpha.0 → 0.12.0-alpha.2

package/LICENSE

@@ -1,4 +1,6 @@
-License: Apache2.0
+License: Apache2.0 (Extension) / All rights reserved (Mobile)
+
+## Keplr Extension License:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -200,4 +202,8 @@ License: Apache2.0
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
+   
+##   Keplr Mobile License
+   
+   Copyright (c) 2021 Chainapsis Inc. All rights reserved.

package/build/hash.d.ts

@@ -1,4 +1,5 @@
 export declare class Hash {
     static sha256(data: Uint8Array): Uint8Array;
+    static keccak256(data: Uint8Array): Uint8Array;
     static truncHashPortion(str: string, firstCharCount?: number, endCharCount?: number): string;
 }

package/build/hash.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hash = void 0;
 const sha_js_1 = require("sha.js");
+const keccak256_1 = require("@ethersproject/keccak256");
+const buffer_1 = require("buffer/");
 class Hash {
     static sha256(data) {
         return new Uint8Array(new sha_js_1.sha256().update(data).digest());
     }
+    static keccak256(data) {
+        return buffer_1.Buffer.from((0, keccak256_1.keccak256)(data).replace("0x", ""), "hex");
+    }
     static truncHashPortion(str, firstCharCount = str.length, endCharCount = 0) {
         return (str.substring(0, firstCharCount) +
             "…" +

package/build/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,MAAa,IAAI;IACf,MAAM,CAAC,MAAM,CAAC,IAAgB;QAC5B,OAAO,IAAI,UAAU,CAAC,IAAI,eAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,gBAAgB,CACrB,GAAW,EACX,cAAc,GAAG,GAAG,CAAC,MAAM,EAC3B,YAAY,GAAG,CAAC;QAEhB,OAAO,CACL,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC;YAChC,GAAG;YACH,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CACrD,CAAC;IACJ,CAAC;CACF;AAhBD,oBAgBC"}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,wDAAqD;AACrD,oCAAiC;AAEjC,MAAa,IAAI;IACf,MAAM,CAAC,MAAM,CAAC,IAAgB;QAC5B,OAAO,IAAI,UAAU,CAAC,IAAI,eAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,IAAgB;QAC/B,OAAO,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAAC,gBAAgB,CACrB,GAAW,EACX,cAAc,GAAG,GAAG,CAAC,MAAM,EAC3B,YAAY,GAAG,CAAC;QAEhB,OAAO,CACL,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC;YAChC,GAAG;YACH,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CACrD,CAAC;IACJ,CAAC;CACF;AApBD,oBAoBC"}

package/build/hash.spec.d.ts

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

package/build/hash.spec.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hash_1 = require("./hash");
+describe("Test hash", () => {
+    it("sha256", () => {
+        expect(Buffer.from(hash_1.Hash.sha256(Buffer.from("12345678", "hex"))).toString("hex")).toBe("b2ed992186a5cb19f6668aade821f502c1d00970dfd0e35128d51bac4649916c");
+    });
+    it("keccak256", () => {
+        expect(Buffer.from(hash_1.Hash.keccak256(Buffer.from("12345678", "hex"))).toString("hex")).toBe("30ca65d5da355227c97ff836c9c6719af9d3835fc6bc72bddc50eeecc1bb2b25");
+    });
+});
+//# sourceMappingURL=hash.spec.js.map

package/build/hash.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hash.spec.js","sourceRoot":"","sources":["../src/hash.spec.ts"],"names":[],"mappings":";;AAAA,iCAA8B;AAE9B,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChB,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,WAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CACzE,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;QACnB,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,WAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAClE,KAAK,CACN,CACF,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA2B;AAC3B,wCAAsB;AACtB,yCAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,wCAAsB;AACtB,yCAAuB"}

package/build/key.d.ts

@@ -5,13 +5,28 @@ export declare class PrivKeySecp256k1 {
     constructor(privKey: Uint8Array);
     toBytes(): Uint8Array;
     getPubKey(): PubKeySecp256k1;
+    /**
+     * @deprecated Use `signDigest32(Hash.sha256(data))` instead.
+     * @param msg
+     */
     sign(msg: Uint8Array): Uint8Array;
+    signDigest32(digest: Uint8Array): Uint8Array;
 }
 export declare class PubKeySecp256k1 {
     protected readonly pubKey: Uint8Array;
     constructor(pubKey: Uint8Array);
-    toBytes(): Uint8Array;
+    toBytes(uncompressed?: boolean): Uint8Array;
+    /**
+     * @deprecated Use `getCosmosAddress()` instead.
+     */
     getAddress(): Uint8Array;
+    getCosmosAddress(): Uint8Array;
+    getEthAddress(): Uint8Array;
     toKeyPair(): ec.KeyPair;
+    /**
+     * @deprecated Use `verifyDigest32(Hash.sha256(data))` instead.
+     * @param msg
+     */
     verify(msg: Uint8Array, signature: Uint8Array): boolean;
+    verifyDigest32(digest: Uint8Array, signature: Uint8Array): boolean;
 }

package/build/key.js

@@ -7,14 +7,15 @@ exports.PubKeySecp256k1 = exports.PrivKeySecp256k1 = void 0;
 const elliptic_1 = require("elliptic");
 const crypto_js_1 = __importDefault(require("crypto-js"));
 const buffer_1 = require("buffer/");
+const hash_1 = require("./hash");
 class PrivKeySecp256k1 {
-    constructor(privKey) {
-        this.privKey = privKey;
-    }
     static generateRandomKey() {
         const secp256k1 = new elliptic_1.ec("secp256k1");
         return new PrivKeySecp256k1(buffer_1.Buffer.from(secp256k1.genKeyPair().getPrivate().toArray()));
     }
+    constructor(privKey) {
+        this.privKey = privKey;
+    }
     toBytes() {
         return new Uint8Array(this.privKey);
     }
@@ -23,11 +24,20 @@ class PrivKeySecp256k1 {
         const key = secp256k1.keyFromPrivate(this.privKey);
         return new PubKeySecp256k1(new Uint8Array(key.getPublic().encodeCompressed("array")));
     }
+    /**
+     * @deprecated Use `signDigest32(Hash.sha256(data))` instead.
+     * @param msg
+     */
     sign(msg) {
+        return this.signDigest32(hash_1.Hash.sha256(msg));
+    }
+    signDigest32(digest) {
+        if (digest.length !== 32) {
+            throw new Error(`Invalid length of digest to sign: ${digest.length}`);
+        }
         const secp256k1 = new elliptic_1.ec("secp256k1");
         const key = secp256k1.keyFromPrivate(this.privKey);
-        const hash = crypto_js_1.default.SHA256(crypto_js_1.default.lib.WordArray.create(msg)).toString();
-        const signature = key.sign(buffer_1.Buffer.from(hash, "hex"), {
+        const signature = key.sign(digest, {
             canonical: true,
         });
         return new Uint8Array(signature.r.toArray("be", 32).concat(signature.s.toArray("be", 32)));
@@ -37,42 +47,68 @@ exports.PrivKeySecp256k1 = PrivKeySecp256k1;
 class PubKeySecp256k1 {
     constructor(pubKey) {
         this.pubKey = pubKey;
+        if (pubKey.length !== 33 && pubKey.length !== 65) {
+            throw new Error(`Invalid length of public key: ${pubKey.length}`);
+        }
     }
-    toBytes() {
-        return new Uint8Array(this.pubKey);
+    toBytes(uncompressed) {
+        if (uncompressed && this.pubKey.length === 65) {
+            return this.pubKey;
+        }
+        if (!uncompressed && this.pubKey.length === 33) {
+            return this.pubKey;
+        }
+        const keyPair = this.toKeyPair();
+        if (uncompressed) {
+            return new Uint8Array(buffer_1.Buffer.from(keyPair.getPublic().encode("hex", false), "hex"));
+        }
+        else {
+            return new Uint8Array(buffer_1.Buffer.from(keyPair.getPublic().encodeCompressed("hex"), "hex"));
+        }
     }
+    /**
+     * @deprecated Use `getCosmosAddress()` instead.
+     */
     getAddress() {
-        let hash = crypto_js_1.default.SHA256(crypto_js_1.default.lib.WordArray.create(this.pubKey)).toString();
+        return this.getCosmosAddress();
+    }
+    getCosmosAddress() {
+        let hash = crypto_js_1.default.SHA256(crypto_js_1.default.lib.WordArray.create(this.toBytes(false))).toString();
         hash = crypto_js_1.default.RIPEMD160(crypto_js_1.default.enc.Hex.parse(hash)).toString();
         return new Uint8Array(buffer_1.Buffer.from(hash, "hex"));
     }
+    getEthAddress() {
+        // Should be uncompressed.
+        // And remove prefix byte.
+        // And hash by keccak256.
+        // Use last 20 bytes.
+        return hash_1.Hash.keccak256(this.toBytes(true).slice(1)).slice(-20);
+    }
     toKeyPair() {
         const secp256k1 = new elliptic_1.ec("secp256k1");
         return secp256k1.keyFromPublic(buffer_1.Buffer.from(this.pubKey).toString("hex"), "hex");
     }
+    /**
+     * @deprecated Use `verifyDigest32(Hash.sha256(data))` instead.
+     * @param msg
+     */
     verify(msg, signature) {
-        const hash = crypto_js_1.default.SHA256(crypto_js_1.default.lib.WordArray.create(msg)).toString();
-        const secp256k1 = new elliptic_1.ec("secp256k1");
-        let r = signature.slice(0, 32);
-        let s = signature.slice(32);
-        const rIsNegative = r[0] >= 0x80;
-        const sIsNegative = s[0] >= 0x80;
-        if (rIsNegative) {
-            r = new Uint8Array([0, ...r]);
+        return this.verifyDigest32(hash_1.Hash.sha256(msg), signature);
+    }
+    verifyDigest32(digest, signature) {
+        if (digest.length !== 32) {
+            throw new Error(`Invalid length of digest to verify: ${digest.length}`);
         }
-        if (sIsNegative) {
-            s = new Uint8Array([0, ...s]);
+        if (signature.length !== 64) {
+            throw new Error(`Invalid length of signature: ${signature.length}`);
         }
-        // Der encoding
-        const derData = new Uint8Array([
-            0x02,
-            r.length,
-            ...r,
-            0x02,
-            s.length,
-            ...s,
-        ]);
-        return secp256k1.verify(buffer_1.Buffer.from(hash, "hex"), new Uint8Array([0x30, derData.length, ...derData]), this.toKeyPair());
+        const secp256k1 = new elliptic_1.ec("secp256k1");
+        const r = signature.slice(0, 32);
+        const s = signature.slice(32);
+        return secp256k1.verify(digest, {
+            r: buffer_1.Buffer.from(r).toString("hex"),
+            s: buffer_1.Buffer.from(s).toString("hex"),
+        }, this.toKeyPair());
     }
 }
 exports.PubKeySecp256k1 = PubKeySecp256k1;

package/build/key.js.map

@@ -1 +1 @@
-{"version":3,"file":"key.js","sourceRoot":"","sources":["../src/key.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"key.js","sourceRoot":"","sources":["../src/key.ts"],"names":[],"mappings":"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"}

package/build/key.spec.js

@@ -2,46 +2,64 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const mnemonic_1 = require("./mnemonic");
 const key_1 = require("./key");
+const hash_1 = require("./hash");
 describe("Test priv key", () => {
     it("priv key should generate the valid pub key", () => {
         const mnemonic = "celery husband drama unaware blue empower jelly twist program say prepare page";
         const privKey = new key_1.PrivKeySecp256k1(mnemonic_1.Mnemonic.generateWalletFromMnemonic(mnemonic));
         const pubKey = privKey.getPubKey();
         expect(pubKey.toBytes()).toStrictEqual(new Uint8Array([
-            2,
-            57,
-            75,
-            197,
-            54,
-            51,
-            54,
-            106,
-            42,
-            185,
-            181,
-            214,
-            151,
-            169,
-            76,
-            140,
-            1,
-            33,
-            204,
-            94,
-            63,
-            13,
-            85,
-            74,
-            99,
-            22,
-            126,
-            219,
-            49,
-            140,
-            234,
-            232,
+            2, 57, 75, 197, 54, 51, 54, 106, 42, 185, 181, 214, 151, 169, 76, 140,
+            1, 33, 204, 94, 63, 13, 85, 74, 99, 22, 126, 219, 49, 140, 234, 232,
             188,
         ]));
+        expect(Buffer.from(pubKey.toBytes(true)).toString("hex")).toBe("04394bc53633366a2ab9b5d697a94c8c0121cc5e3f0d554a63167edb318ceae8bc4eb24976de98fa19e8f947e9aaaca820251c77c45a87049f2c3cd649bb26c3d8");
+    });
+    it("priv key should generate the valid signature", () => {
+        const privKey = key_1.PrivKeySecp256k1.generateRandomKey();
+        const pubKey = privKey.getPubKey();
+        const data = new Uint8Array([1, 2, 3]);
+        const signature = privKey.signDigest32(hash_1.Hash.sha256(data));
+        expect(signature).toStrictEqual(privKey.sign(data));
+        expect(pubKey.verify(data, signature)).toBe(true);
+        expect(pubKey.verifyDigest32(hash_1.Hash.sha256(data), signature)).toBe(true);
+    });
+    it("test assertions", () => {
+        const privKey = key_1.PrivKeySecp256k1.generateRandomKey();
+        const pubKey = privKey.getPubKey();
+        expect(() => {
+            // Not 32 bytes hash
+            privKey.signDigest32(new Uint8Array([1, 2, 3]));
+        }).toThrow();
+        expect(() => {
+            // Not 32 bytes hash
+            pubKey.verifyDigest32(new Uint8Array([1, 2, 3]), new Uint8Array(64));
+        }).toThrow();
+        expect(() => {
+            // Not 64 bytes signature
+            pubKey.verifyDigest32(hash_1.Hash.sha256(new Uint8Array([1, 2, 3])), new Uint8Array(63));
+        }).toThrow();
+    });
+    it("test eth address", () => {
+        const privKey = new key_1.PrivKeySecp256k1(mnemonic_1.Mnemonic.generateWalletFromMnemonic("notice oak worry limit wrap speak medal online prefer cluster roof addict wrist behave treat actual wasp year salad speed social layer crew genius", `m/44'/60'/0'/0/0`));
+        const ethAddress = privKey.getPubKey().getEthAddress();
+        expect(Buffer.from(ethAddress).toString("hex")).toBe("d38de26638cbf4f5c99bd8787fedfdb50c3f236a");
+    });
+    it("public key should handle compress/uncompressed format as input", () => {
+        expect(() => {
+            // Invalid length
+            new key_1.PubKeySecp256k1(new Uint8Array(13));
+        }).toThrow();
+        // uncompressed
+        let pubKey = new key_1.PubKeySecp256k1(Buffer.from("0422b7d0ab1ec915bf3902bd4d3a1dde5d0add15865f951d7ac3fb206e9e898f2d2cd59418a2a27b98eb1e39fc33c55faeed8e550dbf9226a594203c0c2430b0d7", "hex"));
+        expect(Buffer.from(pubKey.getAddress()).toString("hex")).toBe("c1c0ea527e67f52791985f91b22237feccf56b36");
+        expect(Buffer.from(pubKey.getCosmosAddress()).toString("hex")).toBe("c1c0ea527e67f52791985f91b22237feccf56b36");
+        expect(Buffer.from(pubKey.getEthAddress()).toString("hex")).toBe("d38de26638cbf4f5c99bd8787fedfdb50c3f236a");
+        // compressed
+        pubKey = new key_1.PubKeySecp256k1(Buffer.from("0322b7d0ab1ec915bf3902bd4d3a1dde5d0add15865f951d7ac3fb206e9e898f2d", "hex"));
+        expect(Buffer.from(pubKey.getAddress()).toString("hex")).toBe("c1c0ea527e67f52791985f91b22237feccf56b36");
+        expect(Buffer.from(pubKey.getCosmosAddress()).toString("hex")).toBe("c1c0ea527e67f52791985f91b22237feccf56b36");
+        expect(Buffer.from(pubKey.getEthAddress()).toString("hex")).toBe("d38de26638cbf4f5c99bd8787fedfdb50c3f236a");
     });
 });
 //# sourceMappingURL=key.spec.js.map

package/build/key.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"key.spec.js","sourceRoot":"","sources":["../src/key.spec.ts"],"names":[],"mappings":";;AAAA,yCAAsC;AACtC,+BAAyC;AAEzC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,QAAQ,GACZ,gFAAgF,CAAC;QAEnF,MAAM,OAAO,GAAG,IAAI,sBAAgB,CAClC,mBAAQ,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAC9C,CAAC;QACF,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,aAAa,CACpC,IAAI,UAAU,CAAC;YACb,CAAC;YACD,EAAE;YACF,EAAE;YACF,GAAG;YACH,EAAE;YACF,EAAE;YACF,EAAE;YACF,GAAG;YACH,EAAE;YACF,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,EAAE;YACF,GAAG;YACH,CAAC;YACD,EAAE;YACF,GAAG;YACH,EAAE;YACF,EAAE;YACF,EAAE;YACF,EAAE;YACF,EAAE;YACF,EAAE;YACF,EAAE;YACF,GAAG;YACH,GAAG;YACH,EAAE;YACF,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;SACJ,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"key.spec.js","sourceRoot":"","sources":["../src/key.spec.ts"],"names":[],"mappings":"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"}

package/build/mnemonic.d.ts

@@ -1,4 +1,4 @@
-export declare type RNG = <T extends Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null>(array: T) => Promise<T>;
+export type RNG = <T extends Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null>(array: T) => Promise<T>;
 export declare class Mnemonic {
     static generateWallet(rng: RNG, path?: string, password?: string, strength?: number): Promise<{
         privKey: Uint8Array;

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@keplr-wallet/crypto",
-  "version": "0.12.0-alpha.0",
+  "version": "0.12.0-alpha.2",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
-  "private": false,
   "publishConfig": {
     "access": "public"
   },
@@ -22,6 +21,7 @@
     "@types/sha.js": "^2.4.0"
   },
   "dependencies": {
+    "@ethersproject/keccak256": "^5.5.0",
     "bip32": "^2.0.6",
     "bip39": "^3.0.3",
     "bs58check": "^2.1.2",
@@ -30,5 +30,5 @@
     "elliptic": "^6.5.3",
     "sha.js": "^2.4.11"
   },
-  "gitHead": "34327309b724b59f8e41d044db6e57a332614fae"
+  "gitHead": "ac984666c53de8f9325d02ff62f1a0febcafa310"
 }

package/src/hash.spec.ts

@@ -0,0 +1,17 @@
+import { Hash } from "./hash";
+
+describe("Test hash", () => {
+  it("sha256", () => {
+    expect(
+      Buffer.from(Hash.sha256(Buffer.from("12345678", "hex"))).toString("hex")
+    ).toBe("b2ed992186a5cb19f6668aade821f502c1d00970dfd0e35128d51bac4649916c");
+  });
+
+  it("keccak256", () => {
+    expect(
+      Buffer.from(Hash.keccak256(Buffer.from("12345678", "hex"))).toString(
+        "hex"
+      )
+    ).toBe("30ca65d5da355227c97ff836c9c6719af9d3835fc6bc72bddc50eeecc1bb2b25");
+  });
+});

package/src/hash.ts

@@ -1,10 +1,16 @@
 import { sha256 } from "sha.js";
+import { keccak256 } from "@ethersproject/keccak256";
+import { Buffer } from "buffer/";
 
 export class Hash {
   static sha256(data: Uint8Array): Uint8Array {
     return new Uint8Array(new sha256().update(data).digest());
   }
 
+  static keccak256(data: Uint8Array): Uint8Array {
+    return Buffer.from(keccak256(data).replace("0x", ""), "hex");
+  }
+
   static truncHashPortion(
     str: string,
     firstCharCount = str.length,

package/src/key.spec.ts

@@ -1,5 +1,6 @@
 import { Mnemonic } from "./mnemonic";
-import { PrivKeySecp256k1 } from "./key";
+import { PrivKeySecp256k1, PubKeySecp256k1 } from "./key";
+import { Hash } from "./hash";
 
 describe("Test priv key", () => {
   it("priv key should generate the valid pub key", () => {
@@ -12,40 +13,105 @@ describe("Test priv key", () => {
     const pubKey = privKey.getPubKey();
     expect(pubKey.toBytes()).toStrictEqual(
       new Uint8Array([
-        2,
-        57,
-        75,
-        197,
-        54,
-        51,
-        54,
-        106,
-        42,
-        185,
-        181,
-        214,
-        151,
-        169,
-        76,
-        140,
-        1,
-        33,
-        204,
-        94,
-        63,
-        13,
-        85,
-        74,
-        99,
-        22,
-        126,
-        219,
-        49,
-        140,
-        234,
-        232,
+        2, 57, 75, 197, 54, 51, 54, 106, 42, 185, 181, 214, 151, 169, 76, 140,
+        1, 33, 204, 94, 63, 13, 85, 74, 99, 22, 126, 219, 49, 140, 234, 232,
         188,
       ])
     );
+    expect(Buffer.from(pubKey.toBytes(true)).toString("hex")).toBe(
+      "04394bc53633366a2ab9b5d697a94c8c0121cc5e3f0d554a63167edb318ceae8bc4eb24976de98fa19e8f947e9aaaca820251c77c45a87049f2c3cd649bb26c3d8"
+    );
+  });
+
+  it("priv key should generate the valid signature", () => {
+    const privKey = PrivKeySecp256k1.generateRandomKey();
+    const pubKey = privKey.getPubKey();
+
+    const data = new Uint8Array([1, 2, 3]);
+    const signature = privKey.signDigest32(Hash.sha256(data));
+    expect(signature).toStrictEqual(privKey.sign(data));
+
+    expect(pubKey.verify(data, signature)).toBe(true);
+    expect(pubKey.verifyDigest32(Hash.sha256(data), signature)).toBe(true);
+  });
+
+  it("test assertions", () => {
+    const privKey = PrivKeySecp256k1.generateRandomKey();
+    const pubKey = privKey.getPubKey();
+
+    expect(() => {
+      // Not 32 bytes hash
+      privKey.signDigest32(new Uint8Array([1, 2, 3]));
+    }).toThrow();
+
+    expect(() => {
+      // Not 32 bytes hash
+      pubKey.verifyDigest32(new Uint8Array([1, 2, 3]), new Uint8Array(64));
+    }).toThrow();
+
+    expect(() => {
+      // Not 64 bytes signature
+      pubKey.verifyDigest32(
+        Hash.sha256(new Uint8Array([1, 2, 3])),
+        new Uint8Array(63)
+      );
+    }).toThrow();
+  });
+
+  it("test eth address", () => {
+    const privKey = new PrivKeySecp256k1(
+      Mnemonic.generateWalletFromMnemonic(
+        "notice oak worry limit wrap speak medal online prefer cluster roof addict wrist behave treat actual wasp year salad speed social layer crew genius",
+        `m/44'/60'/0'/0/0`
+      )
+    );
+
+    const ethAddress = privKey.getPubKey().getEthAddress();
+    expect(Buffer.from(ethAddress).toString("hex")).toBe(
+      "d38de26638cbf4f5c99bd8787fedfdb50c3f236a"
+    );
+  });
+
+  it("public key should handle compress/uncompressed format as input", () => {
+    expect(() => {
+      // Invalid length
+      new PubKeySecp256k1(new Uint8Array(13));
+    }).toThrow();
+
+    // uncompressed
+    let pubKey = new PubKeySecp256k1(
+      Buffer.from(
+        "0422b7d0ab1ec915bf3902bd4d3a1dde5d0add15865f951d7ac3fb206e9e898f2d2cd59418a2a27b98eb1e39fc33c55faeed8e550dbf9226a594203c0c2430b0d7",
+        "hex"
+      )
+    );
+
+    expect(Buffer.from(pubKey.getAddress()).toString("hex")).toBe(
+      "c1c0ea527e67f52791985f91b22237feccf56b36"
+    );
+    expect(Buffer.from(pubKey.getCosmosAddress()).toString("hex")).toBe(
+      "c1c0ea527e67f52791985f91b22237feccf56b36"
+    );
+    expect(Buffer.from(pubKey.getEthAddress()).toString("hex")).toBe(
+      "d38de26638cbf4f5c99bd8787fedfdb50c3f236a"
+    );
+
+    // compressed
+    pubKey = new PubKeySecp256k1(
+      Buffer.from(
+        "0322b7d0ab1ec915bf3902bd4d3a1dde5d0add15865f951d7ac3fb206e9e898f2d",
+        "hex"
+      )
+    );
+
+    expect(Buffer.from(pubKey.getAddress()).toString("hex")).toBe(
+      "c1c0ea527e67f52791985f91b22237feccf56b36"
+    );
+    expect(Buffer.from(pubKey.getCosmosAddress()).toString("hex")).toBe(
+      "c1c0ea527e67f52791985f91b22237feccf56b36"
+    );
+    expect(Buffer.from(pubKey.getEthAddress()).toString("hex")).toBe(
+      "d38de26638cbf4f5c99bd8787fedfdb50c3f236a"
+    );
   });
 });

package/src/key.ts

@@ -2,6 +2,7 @@ import { ec } from "elliptic";
 import CryptoJS from "crypto-js";
 
 import { Buffer } from "buffer/";
+import { Hash } from "./hash";
 
 export class PrivKeySecp256k1 {
   static generateRandomKey(): PrivKeySecp256k1 {
@@ -28,15 +29,23 @@ export class PrivKeySecp256k1 {
     );
   }
 
+  /**
+   * @deprecated Use `signDigest32(Hash.sha256(data))` instead.
+   * @param msg
+   */
   sign(msg: Uint8Array): Uint8Array {
+    return this.signDigest32(Hash.sha256(msg));
+  }
+
+  signDigest32(digest: Uint8Array): Uint8Array {
+    if (digest.length !== 32) {
+      throw new Error(`Invalid length of digest to sign: ${digest.length}`);
+    }
+
     const secp256k1 = new ec("secp256k1");
     const key = secp256k1.keyFromPrivate(this.privKey);
 
-    const hash = CryptoJS.SHA256(
-      CryptoJS.lib.WordArray.create(msg as any)
-    ).toString();
-
-    const signature = key.sign(Buffer.from(hash, "hex"), {
+    const signature = key.sign(digest, {
       canonical: true,
     });
 
@@ -47,21 +56,56 @@ export class PrivKeySecp256k1 {
 }
 
 export class PubKeySecp256k1 {
-  constructor(protected readonly pubKey: Uint8Array) {}
+  constructor(protected readonly pubKey: Uint8Array) {
+    if (pubKey.length !== 33 && pubKey.length !== 65) {
+      throw new Error(`Invalid length of public key: ${pubKey.length}`);
+    }
+  }
 
-  toBytes(): Uint8Array {
-    return new Uint8Array(this.pubKey);
+  toBytes(uncompressed?: boolean): Uint8Array {
+    if (uncompressed && this.pubKey.length === 65) {
+      return this.pubKey;
+    }
+    if (!uncompressed && this.pubKey.length === 33) {
+      return this.pubKey;
+    }
+
+    const keyPair = this.toKeyPair();
+    if (uncompressed) {
+      return new Uint8Array(
+        Buffer.from(keyPair.getPublic().encode("hex", false), "hex")
+      );
+    } else {
+      return new Uint8Array(
+        Buffer.from(keyPair.getPublic().encodeCompressed("hex"), "hex")
+      );
+    }
   }
 
+  /**
+   * @deprecated Use `getCosmosAddress()` instead.
+   */
   getAddress(): Uint8Array {
+    return this.getCosmosAddress();
+  }
+
+  getCosmosAddress(): Uint8Array {
     let hash = CryptoJS.SHA256(
-      CryptoJS.lib.WordArray.create(this.pubKey as any)
+      CryptoJS.lib.WordArray.create(this.toBytes(false) as any)
     ).toString();
     hash = CryptoJS.RIPEMD160(CryptoJS.enc.Hex.parse(hash)).toString();
 
     return new Uint8Array(Buffer.from(hash, "hex"));
   }
 
+  getEthAddress(): Uint8Array {
+    // Should be uncompressed.
+    // And remove prefix byte.
+    // And hash by keccak256.
+    // Use last 20 bytes.
+    return Hash.keccak256(this.toBytes(true).slice(1)).slice(-20);
+  }
+
   toKeyPair(): ec.KeyPair {
     const secp256k1 = new ec("secp256k1");
 
@@ -71,36 +115,34 @@ export class PubKeySecp256k1 {
     );
   }
 
+  /**
+   * @deprecated Use `verifyDigest32(Hash.sha256(data))` instead.
+   * @param msg
+   */
   verify(msg: Uint8Array, signature: Uint8Array): boolean {
-    const hash = CryptoJS.SHA256(
-      CryptoJS.lib.WordArray.create(msg as any)
-    ).toString();
-
-    const secp256k1 = new ec("secp256k1");
+    return this.verifyDigest32(Hash.sha256(msg), signature);
+  }
 
-    let r = signature.slice(0, 32);
-    let s = signature.slice(32);
-    const rIsNegative = r[0] >= 0x80;
-    const sIsNegative = s[0] >= 0x80;
-    if (rIsNegative) {
-      r = new Uint8Array([0, ...r]);
+  verifyDigest32(digest: Uint8Array, signature: Uint8Array): boolean {
+    if (digest.length !== 32) {
+      throw new Error(`Invalid length of digest to verify: ${digest.length}`);
     }
-    if (sIsNegative) {
-      s = new Uint8Array([0, ...s]);
+
+    if (signature.length !== 64) {
+      throw new Error(`Invalid length of signature: ${signature.length}`);
     }
 
-    // Der encoding
-    const derData = new Uint8Array([
-      0x02,
-      r.length,
-      ...r,
-      0x02,
-      s.length,
-      ...s,
-    ]);
+    const secp256k1 = new ec("secp256k1");
+
+    const r = signature.slice(0, 32);
+    const s = signature.slice(32);
+
     return secp256k1.verify(
-      Buffer.from(hash, "hex"),
-      new Uint8Array([0x30, derData.length, ...derData]),
+      digest,
+      {
+        r: Buffer.from(r).toString("hex"),
+        s: Buffer.from(s).toString("hex"),
+      },
       this.toKeyPair()
     );
   }