Update hdkey to to use secp256k1 v4

Author: alcuadrado

packages/ethereum-cryptography/hdkey-without-crypto-config/rollup.config.js

@@ -19,7 +19,7 @@ export default {
       ]
     }),
     commonjs({
-      ignore: ["../shims/hdkey-crypto", "../secp256k1"]
+      ignore: ["../shims/hdkey-crypto", "../shims/hdkey-secp256k1v3"]
     })
   ]
 };

packages/ethereum-cryptography/hdkey-without-crypto-config/secp256k1-shim.js

@@ -1 +1 @@
-module.exports = require("../secp256k1");
+module.exports = require("../shims/hdkey-secp256k1v3");

packages/ethereum-cryptography/src/pure/shims/hdkey-crypto.ts

@@ -1,3 +1,41 @@
+import { ripemd160 } from "../ripemd160";
+import { sha256 } from "../sha256";
+
 export const createHmac = require("create-hmac");
-export const createHash = require("create-hash");
 export const randomBytes = require("randombytes");
+
+class Hash {
+  private buffers: Buffer[] = [];
+
+  constructor(private readonly hashFunction: (msg: Buffer) => Buffer) {}
+
+  public update(buffer: Buffer): this {
+    if (!Buffer.isBuffer(buffer)) {
+      throw new Error("hdkey-crypto shim is outdated");
+    }
+
+    this.buffers.push(buffer);
+
+    return this;
+  }
+
+  public digest(param: any): Buffer {
+    if (param) {
+      throw new Error("hdkey-crypto shim is outdated");
+    }
+
+    return this.hashFunction(Buffer.concat(this.buffers));
+  }
+}
+
+export const createHash = (name: string) => {
+  if (name === "ripemd160") {
+    return new Hash(ripemd160);
+  }
+
+  if (name === "sha256") {
+    return new Hash(sha256);
+  }
+
+  throw new Error("hdkey-crypto shim is outdated");
+};

packages/ethereum-cryptography/src/pure/shims/hdkey-secp256k1v3.ts

@@ -0,0 +1 @@
+export * from "../../shims/hdkey-secp256k1v3";

packages/ethereum-cryptography/src/shims/hdkey-crypto.ts

@@ -1 +1 @@
-export { createHmac, createHash, randomBytes } from "crypto";
+export { createHash, createHmac, randomBytes } from "crypto";

packages/ethereum-cryptography/src/shims/hdkey-secp256k1v3.ts

@@ -0,0 +1,49 @@
+import * as secp256k1 from "secp256k1";
+
+export function privateKeyVerify(privateKey: Buffer): boolean {
+  return secp256k1.privateKeyVerify(privateKey);
+}
+
+export function publicKeyCreate(privateKey: Buffer, compressed = true): Buffer {
+  return Buffer.from(secp256k1.publicKeyCreate(privateKey, compressed));
+}
+
+export function publicKeyVerify(publicKey: Buffer): boolean {
+  return secp256k1.publicKeyVerify(publicKey);
+}
+
+export function publicKeyConvert(publicKey: Buffer, compressed = true): Buffer {
+  return Buffer.from(secp256k1.publicKeyConvert(publicKey, compressed));
+}
+
+export function privateKeyTweakAdd(publicKey: Buffer, tweak: Buffer): Buffer {
+  return Buffer.from(
+    secp256k1.privateKeyTweakAdd(Buffer.from(publicKey), tweak)
+  );
+}
+
+export function publicKeyTweakAdd(
+  publicKey: Buffer,
+  tweak: Buffer,
+  compressed = true
+): Buffer {
+  return Buffer.from(
+    secp256k1.publicKeyTweakAdd(Buffer.from(publicKey), tweak, compressed)
+  );
+}
+
+export function sign(
+  message: Buffer,
+  privateKey: Buffer
+): { signature: Buffer; recovery: number } {
+  const ret = secp256k1.ecdsaSign(message, privateKey);
+  return { signature: Buffer.from(ret.signature), recovery: ret.recid };
+}
+
+export function verify(
+  message: Buffer,
+  signature: Buffer,
+  publicKey: Buffer
+): boolean {
+  return secp256k1.ecdsaVerify(signature, message, publicKey);
+}

packages/ethereum-cryptography/test/test-vectors/hdkey.ts

@@ -2,7 +2,7 @@ import { assert } from "chai";
 
 export function createTests(HDKey: any) {
   describe("hdkey", function() {
-    it("Should derive correctly", function() {
+    it("Should derive private key correctly", function() {
       const seed =
         "fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542";
       const hdkey = HDKey.fromMasterSeed(Buffer.from(seed, "hex"));
@@ -13,5 +13,18 @@ export function createTests(HDKey: any) {
         "xprv9zFnWC6h2cLgpmSA46vutJzBcfJ8yaJGg8cX1e5StJh45BBciYTRXSd25UEPVuesF9yog62tGAQtHjXajPPdbRCHuWS6T8XA2ECKADdw4Ef"
       );
     });
+
+    it("Should derive public key correctly", function() {
+      const seed =
+        "fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542";
+      const hdkey = HDKey.fromMasterSeed(Buffer.from(seed, "hex"));
+      const expected = hdkey.derive("m/0/2147483647'/1");
+      const parentkey = hdkey.derive("m/0/2147483647'");
+      parentkey.wipePrivateData();
+
+      const childkey = parentkey.derive("m/1");
+
+      assert.equal(childkey.publicExtendedKey, expected.publicExtendedKey);
+    });
   });
 }