ethereumjs · holgerd77 · Jul 15, 2020 · Jun 10, 2020 · Jun 16, 2020 · Jun 19, 2020
diff --git a/package.json b/package.json
@@ -91,10 +91,10 @@
     "@types/bn.js": "^4.11.3",
     "bn.js": "^4.11.0",
     "create-hash": "^1.1.2",
+    "ethereum-cryptography": "^0.1.3",
+    "elliptic": "^6.5.2",
     "ethjs-util": "0.1.6",
-    "keccak": "^2.0.0",
-    "rlp": "^2.2.3",
-    "secp256k1": "^3.0.1"
+    "rlp": "^2.2.3"
   },
   "devDependencies": {
     "@ethereumjs/config-prettier": "^1.1.0",

diff --git a/src/account.ts b/src/account.ts
@@ -1,6 +1,6 @@
 const assert = require('assert')
 const ethjsUtil = require('ethjs-util')
-const secp256k1 = require('secp256k1')
+const secp256k1 = require('./secp256k1v3-adapter')
 import BN = require('bn.js')
 import { toBuffer, addHexPrefix, zeros, bufferToHex, unpad } from './bytes'
 import { keccak, keccak256, rlphash } from './hash'

diff --git a/src/hash.ts b/src/hash.ts
@@ -1,4 +1,4 @@
-const createKeccakHash = require('keccak')
+const { keccak224, keccak384, keccak256: k256, keccak512 } = require('ethereum-cryptography/keccak')
 const createHash = require('create-hash')
 const ethjsUtil = require('ethjs-util')
 import rlp = require('rlp')
@@ -19,9 +19,23 @@ export const keccak = function(a: any, bits: number = 256): Buffer {
 
   if (!bits) bits = 256
 
-  return createKeccakHash(`keccak${bits}`)
-    .update(a)
-    .digest()
+  switch (bits) {
+    case 224: {
+      return keccak224(a)
+    }
+    case 256: {
+      return k256(a)
+    }
+    case 384: {
+      return keccak384(a)
+    }
+    case 512: {
+      return keccak512(a)
+    }
+    default: {
+      throw new Error(`Invald algorithm: keccak${bits}`)
+    }
+  }
 }
 
 /**

diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-const secp256k1 = require('secp256k1')
+const secp256k1 = require('./secp256k1v3-adapter')
 const ethjsUtil = require('ethjs-util')
 import BN = require('bn.js')
 import rlp = require('rlp')