Merge pull request #1315 from ethereum/ethereumjs-util-update

remix-debug/package.json

@@ -19,7 +19,7 @@
   "main": "./index.js",
   "dependencies": {
     "commander": "^2.19.0",
-    "ethereumjs-util": "^4.5.0",
+    "ethereumjs-util": "^6.1.0",
     "ethereumjs-vm": "3.0.0",
     "fast-async": "^6.1.2",
     "remix-lib": "0.4.14",

remix-lib/package-lock.json

 {
   "name": "remix-lib",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2687,6 +2687,22 @@
         "ethereumjs-util": "^5.0.0",
         "rlp": "^2.0.0",
         "safe-buffer": "^5.1.1"
+      },
+      "dependencies": {
+        "ethereumjs-util": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
+          "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
+          "requires": {
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "ethjs-util": "^0.1.3",
+            "keccak": "^1.0.2",
+            "rlp": "^2.0.0",
+            "safe-buffer": "^5.1.1",
+            "secp256k1": "^3.0.1"
+          }
+        }
       }
     },
     "ethereumjs-block": {
@@ -2699,6 +2715,22 @@
         "ethereumjs-tx": "^1.2.2",
         "ethereumjs-util": "^5.0.0",
         "merkle-patricia-tree": "^2.1.2"
+      },
+      "dependencies": {
+        "ethereumjs-util": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
+          "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
+          "requires": {
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "ethjs-util": "^0.1.3",
+            "keccak": "^1.0.2",
+            "rlp": "^2.0.0",
+            "safe-buffer": "^5.1.1",
+            "secp256k1": "^3.0.1"
+          }
+        }
       }
     },
     "ethereumjs-blockchain": {
@@ -2780,8 +2812,6 @@
           "version": "0.0.18",
           "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
           "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8="
-        }
-      }
         },
         "ethereumjs-util": {
           "version": "5.2.0",
@@ -2796,6 +2826,22 @@
             "safe-buffer": "^5.1.1",
             "secp256k1": "^3.0.1"
           }
+        }
+      }
+    },
+    "ethereumjs-util": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+      "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+      "requires": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "ethjs-util": "0.1.6",
+        "keccak": "^1.0.2",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1",
+        "secp256k1": "^3.0.1"
+      }
     },
     "ethereumjs-vm": {
       "version": "3.0.0",
@@ -3803,6 +3849,20 @@
           "version": "1.5.2",
           "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+        },
+        "ethereumjs-util": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
+          "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
+          "requires": {
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "ethjs-util": "^0.1.3",
+            "keccak": "^1.0.2",
+            "rlp": "^2.0.0",
+            "safe-buffer": "^5.1.1",
+            "secp256k1": "^3.0.1"
+          }
         }
       }
     },

remix-lib/package.json

@@ -17,7 +17,7 @@
     "async": "^2.1.2",
     "ethereumjs-block": "^1.6.0",
     "ethereumjs-tx": "^1.3.3",
-    "ethereumjs-util": "^5.1.2",
+    "ethereumjs-util": "^6.1.0",
     "ethereumjs-vm": "3.0.0",
     "ethers": "^4.0.27",
     "events": "^3.0.0",

remix-lib/src/execution/execution-context.js

@@ -34,7 +34,7 @@ class StateManagerCommonStorageDump extends StateManager {
   }
 
   putContractStorage (address, key, value, cb) {
-    this.keyHashes[ethUtil.sha3(key).toString('hex')] = ethUtil.bufferToHex(key)
+    this.keyHashes[ethUtil.keccak(key).toString('hex')] = ethUtil.bufferToHex(key)
     super.putContractStorage(address, key, value, cb)
   }
 

remix-lib/src/util.js

@@ -162,7 +162,7 @@ module.exports = {
       value = '0x' + value
     }
     var ret = ethutil.bufferToHex(ethutil.setLengthLeft(value, 32))
-    ret = ethutil.sha3(ret)
+    ret = ethutil.keccak(ret)
     return ethutil.bufferToHex(ret)
   },
 

remix-simulator/package.json

@@ -20,7 +20,7 @@
     "color-support": "^1.1.3",
     "commander": "^2.19.0",
     "cors": "^2.8.5",
-    "ethereumjs-util": "^5.1.2",
+    "ethereumjs-util": "^6.1.0",
     "ethereumjs-vm": "3.0.0",
     "express": "^4.16.3",
     "express-ws": "^4.0.0",

remix-solidity/package.json

@@ -14,7 +14,7 @@
   ],
   "main": "./index.js",
   "dependencies": {
-    "ethereumjs-util": "^4.5.0",
+    "ethereumjs-util": "^6.1.0",
     "ethereumjs-vm": "3.0.0",
     "fast-async": "^6.1.2",
     "remix-lib": "0.4.14",