devDeps(test): replace ethereumjs-util with @ethereumjs/util,ethereum…

…-cryptography

package.json

@@ -58,6 +58,7 @@
     "babelify": "^10.0.0",
     "browserify": "^16.5.0",
     "eslint": "^6.2.0",
+    "ethereum-cryptography": "^2.1.2",
     "ethjs": "^0.3.6",
     "ganache-core": "^2.7.0",
     "tape": "^4.4.0"

test/subproviders/etherscan.js

@@ -1,4 +1,4 @@
-const sha3 = require('ethereumjs-util').sha3;
+const { keccak_256 } = require('ethereum-cryptography');
 const test = require('tape')
 const ProviderEngine = require('../../index.js')
 const createPayload = require('../../util/create-payload.js')
@@ -107,7 +107,7 @@ test('etherscan eth_getBalance', function(t) {
 test('etherscan eth_call', function(t) {
   t.plan(3)
 
-  var signature = Buffer.concat([sha3("getLatestBlock()", 256)], 4).toString('hex');
+  var signature = Buffer.concat([keccak_256(Buffer.from("getLatestBlock()"), 256)], 4).toString('hex');
   var engine = new ProviderEngine()
   var etherscan = new EtherscanSubprovider()
   engine.addProvider(etherscan)

test/subproviders/ipc.js

@@ -1,4 +1,3 @@
-const sha3 = require('ethereumjs-util').sha3;
 const test = require('tape')
 const ProviderEngine = require('../../index.js')
 const createPayload = require('../../util/create-payload.js')

test/subproviders/vm.js

@@ -1,6 +1,6 @@
 const test = require('tape')
 const async = require('async')
-const ethUtil = require('ethereumjs-util')
+const { toBuffer } = require('@ethereumjs/util')
 const ProviderEngine = require('../../index.js')
 const VmSubprovider = require('../../subproviders/vm')
 const TestBlockProvider = require('../util/block.js')
@@ -39,14 +39,14 @@ test('binary search eth_estimateGas implementation', function(t) {
                 cb(new Error('fake out of gas'))
             } else {
                 cb(null, {
-                    gasUsed: ethUtil.toBuffer(scenario.gasNeeded),
+                    gasUsed: toBuffer(scenario.gasNeeded),
                 });
             }
         }
         engine.addProvider(vmSubprovider)
         engine.addProvider(new TestBlockProvider());
         engine.start()
-        
+
         engine.sendAsync(createPayload({
           method: 'eth_estimateGas',
           params: [{}, 'latest'],

test/util/block.js

@@ -1,6 +1,6 @@
 const crypto = require('crypto')
 const extend = require('xtend')
-const ethUtil = require('ethereumjs-util')
+const { addHexPrefix, bufferToHex, intToHex, stripHexPrefix } = require('@ethereumjs/util')
 const FixtureProvider = require('../../subproviders/fixture.js')
 
 //
@@ -108,7 +108,7 @@ function createBlock(blockParams, prevBlock, txs) {
   blockParams = blockParams || {}
   txs = txs || []
   var defaultNumber = prevBlock ? incrementHex(prevBlock.number) : '0x1'
-  var defaultGasLimit = ethUtil.intToHex(4712388)
+  var defaultGasLimit = intToHex(4712388)
   const result = extend({
     // defaults
     number:            defaultNumber,
@@ -135,29 +135,29 @@ function createBlock(blockParams, prevBlock, txs) {
   txs.forEach((tx, index) => {
     tx.blockHash = result.hash
     tx.blockNumber = result.number
-    tx.transactionIndex = ethUtil.intToHex(index)
+    tx.transactionIndex = intToHex(index)
   })
   return result
 }
 
 function incrementHex(hexString){
-  return stripLeadingZeroes(ethUtil.intToHex(Number(hexString)+1))
+  return stripLeadingZeroes(intToHex(Number(hexString)+1))
 }
 
 function randomHash(){
-  return ethUtil.bufferToHex(crypto.randomBytes(32))
+  return bufferToHex(crypto.randomBytes(32))
 }
 
 function randomAddress(){
-  return ethUtil.bufferToHex(crypto.randomBytes(20))
+  return bufferToHex(crypto.randomBytes(20))
 }
 
 function stripLeadingZeroes (hexString) {
-  let strippedHex = ethUtil.stripHexPrefix(hexString)
+  let strippedHex = stripHexPrefix(hexString)
   while (strippedHex[0] === '0') {
     strippedHex = strippedHex.substr(1)
   }
-  return ethUtil.addHexPrefix(strippedHex)
+  return addHexPrefix(strippedHex)
 }
 
-module.exports = TestBlockProvider
+module.exports = TestBlockProvider

test/util/ganache.js

@@ -10,4 +10,4 @@ class GanacheProvider extends ProviderSubprovider {
 
 }
 
-module.exports = GanacheProvider
+module.exports = GanacheProvider