ethereumjs dependencies updated in remix-debug

remix-debug/package.json

@@ -19,9 +19,8 @@
   "main": "./index.js",
   "dependencies": {
     "commander": "^2.19.0",
-    "ethereumjs-util": "^6.1.0",
-    "ethereumjs-vm": "3.0.0",
-    "fast-async": "^6.1.2",
+    "ethereumjs-util": "^6.2.0",
+    "ethereumjs-vm": "4.1.1",
     "remix-lib": "0.4.15",
     "web3": "0.20.6"
   },

remix-debug/test/decoder/vmCall.js

@@ -1,6 +1,6 @@
 'use strict'
 var utileth = require('ethereumjs-util')
-var Tx = require('ethereumjs-tx')
+var Tx = require('ethereumjs-tx').Transaction
 var Block = require('ethereumjs-block')
 var BN = require('ethereumjs-util').BN
 var remixLib = require('remix-lib')
@@ -34,8 +34,7 @@ function sendTx (vm, from, to, value, data, cb) {
   Init VM / Send Transaction
 */
 function initVM (st, privateKey) {
-  var utileth = require('ethereumjs-util')
-  var VM = require('ethereumjs-vm')
+  var VM = require('ethereumjs-vm').default
   var Web3Providers = remixLib.vm.Web3Providers
   var address = utileth.privateToAddress(privateKey)
   var vm = new VM({

remix-debug/test/vmCall.js

@@ -1,6 +1,6 @@
 'use strict'
 var utileth = require('ethereumjs-util')
-var Tx = require('ethereumjs-tx')
+var Tx = require('ethereumjs-tx').Transaction
 var Block = require('ethereumjs-block')
 var BN = require('ethereumjs-util').BN
 var remixLib = require('remix-lib')
@@ -34,8 +34,7 @@ function sendTx (vm, from, to, value, data, cb) {
   Init VM / Send Transaction
 */
 function initVM (st, privateKey) {
-  var utileth = require('ethereumjs-util')
-  var VM = require('ethereumjs-vm')
+  var VM = require('ethereumjs-vm').default
   var Web3Providers = remixLib.vm.Web3Providers
   var address = utileth.privateToAddress(privateKey)
   var vm = new VM({

remix-lib/src/execution/txExecution.js

@@ -70,10 +70,10 @@ module.exports = {
       error: false,
       message: ''
     }
-    if (!txResult.result.vm.exceptionError) {
+    if (!txResult.result.execResult.exceptionError) {
       return ret
     }
-    var exceptionError = txResult.result.vm.exceptionError.error || ''
+    var exceptionError = txResult.result.execResult.exceptionError.error || ''
     var error = `VM error: ${exceptionError}.\n`
     var msg
     if (exceptionError === errorCode.INVALID_OPCODE) {
@@ -83,7 +83,7 @@ module.exports = {
       msg = `\tThe transaction ran out of gas. Please increase the Gas Limit.\n`
       ret.error = true
     } else if (exceptionError === errorCode.REVERT) {
-      var returnData = txResult.result.vm.return
+      var returnData = txResult.result.execResult.returnValue
       // It is the hash of Error(string)
       if (returnData && (returnData.slice(0, 4).toString('hex') === '08c379a0')) {
         var abiCoder = new ethers.utils.AbiCoder()