Use secp256k1 lib instead of shims.

nebojsa94 · nebojsa94 · commit eda4d21cdbc3 · 2020-06-19T21:32:15.000+02:00
diff --git a/src/account.ts b/src/account.ts
@@ -4,7 +4,7 @@ const {
   publicKeyCreate,
   publicKeyVerify,
   publicKeyConvert,
-} = require('ethereum-cryptography/shims/hdkey-secp256k1v3')
+} = require('ethereum-cryptography/secp256k1')
 import * as assert from 'assert'
 import * as BN from 'bn.js'
 import { zeros, bufferToHex, toBuffer } from './bytes'
@@ -156,7 +156,7 @@ export const isValidPublic = function(publicKey: Buffer, sanitize: boolean = fal
 export const pubToAddress = function(pubKey: Buffer, sanitize: boolean = false): Buffer {
   assertIsBuffer(pubKey)
   if (sanitize && pubKey.length !== 64) {
-    pubKey = toBuffer(publicKeyConvert(pubKey, false).slice(1))
+    pubKey = Buffer.from(publicKeyConvert(pubKey, false).slice(1))
   }
   assert(pubKey.length === 64)
   // Only take the lower 160bits of the hash
@@ -179,7 +179,7 @@ export const privateToAddress = function(privateKey: Buffer): Buffer {
 export const privateToPublic = function(privateKey: Buffer): Buffer {
   assertIsBuffer(privateKey)
   // skip the type flag and use the X, Y points
-  return toBuffer(publicKeyCreate(privateKey, false).slice(1))
+  return Buffer.from(publicKeyCreate(privateKey, false)).slice(1)
 }
 
 /**
@@ -188,7 +188,7 @@ export const privateToPublic = function(privateKey: Buffer): Buffer {
 export const importPublic = function(publicKey: Buffer): Buffer {
   assertIsBuffer(publicKey)
   if (publicKey.length !== 64) {
-    publicKey = toBuffer(publicKeyConvert(publicKey, false).slice(1))
+    publicKey = Buffer.from(publicKeyConvert(publicKey, false).slice(1))
   }
   return publicKey
 }
diff --git a/src/signature.ts b/src/signature.ts
@@ -1,5 +1,4 @@
-const { sign, publicKeyConvert } = require('ethereum-cryptography/shims/hdkey-secp256k1v3')
-const { ecdsaRecover } = require('ethereum-cryptography/secp256k1')
+const { ecdsaSign, ecdsaRecover, publicKeyConvert } = require('ethereum-cryptography/secp256k1')
 import * as BN from 'bn.js'
 import { toBuffer, setLengthLeft, bufferToHex } from './bytes'
 import { keccak } from './hash'
@@ -19,12 +18,12 @@ export const ecsign = function(
   privateKey: Buffer,
   chainId?: number,
 ): ECDSASignature {
-  const sig = sign(msgHash, privateKey)
-  const recovery: number = sig.recovery
+  const sig = ecdsaSign(msgHash, privateKey)
+  const recovery: number = sig.recid
 
   const ret = {
-    r: toBuffer(sig.signature.slice(0, 32)),
-    s: toBuffer(sig.signature.slice(32, 64)),
+    r: Buffer.from(sig.signature.slice(0, 32)),
+    s: Buffer.from(sig.signature.slice(32, 64)),
     v: chainId ? recovery + (chainId * 2 + 35) : recovery + 27,
   }
 
@@ -48,7 +47,7 @@ export const ecrecover = function(
     throw new Error('Invalid signature v value')
   }
   const senderPubKey = ecdsaRecover(signature, recovery, msgHash)
-  return toBuffer(publicKeyConvert(senderPubKey, false).slice(1))
+  return Buffer.from(publicKeyConvert(senderPubKey, false).slice(1))
 }
 
 /**
