Merge pull request #241 from jchavarri/update-ethereumjs-util-v5

Update ethereumjs-util to 5.1.3
ethereumjs · Jan 12, 2018 · 869f832 · 869f832
2 parents f0d7cfa + f1a8db6
commit 869f832
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/opFns.js b/lib/opFns.js
@@ -914,7 +914,7 @@ function memLoad (runState, offset, length) {
 
   // shortcut
   if (length.isZero()) {
-    return new Buffer('')
+    return Buffer.alloc(0)
   }
 
   // NOTE: in theory this could overflow, but unlikely due to OOG above
@@ -1023,7 +1023,7 @@ function makeCall (runState, callOptions, localOpts, cb) {
   callOptions.depth = runState.depth + 1
 
   // empty the return data buffer
-  runState.lastReturned = new Buffer([])
+  runState.lastReturned = Buffer.alloc(0)
 
   // check if account has enough ether
   // Note: in the case of delegatecall, the value is persisted and doesn't need to be deducted again

diff --git a/lib/precompiled/01-ecrecover.js b/lib/precompiled/01-ecrecover.js
@@ -27,7 +27,7 @@ module.exports = function (opts) {
 
   var publicKey
   try {
-    publicKey = utils.ecrecover(msgHash, v, r, s)
+    publicKey = utils.ecrecover(msgHash, new BN(v).toNumber(), r, s)
   } catch (e) {
     return results
   }

diff --git a/lib/runCall.js b/lib/runCall.js
@@ -172,7 +172,7 @@ module.exports = function (opts, cb) {
         if (totalGas.lte(gasLimit) && results.return.length <= 24576) {
           results.gasUsed = totalGas
         } else {
-          results.return = Buffer.from([])
+          results.return = Buffer.alloc(0)
           // since Homestead
           results.exception = 0
           err = results.exceptionError = ERROR.OUT_OF_GAS

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "ethereum-common": "0.2.0",
     "ethereumjs-account": "^2.0.3",
     "ethereumjs-block": "~1.7.0",
-    "ethereumjs-util": "4.5.0",
+    "ethereumjs-util": "^5.1.3",
     "fake-merkle-patricia-tree": "^1.0.1",
     "functional-red-black-tree": "^1.0.1",
     "merkle-patricia-tree": "^2.1.2",