Commit 3e2b4a3d authored by aniket-engg's avatar aniket-engg Committed by Aniket

ethereumjs dependencies updated in remix-debug

parent 62c9d65b
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
"main": "./index.js", "main": "./index.js",
"dependencies": { "dependencies": {
"commander": "^2.19.0", "commander": "^2.19.0",
"ethereumjs-util": "^6.1.0", "ethereumjs-util": "^6.2.0",
"ethereumjs-vm": "3.0.0", "ethereumjs-vm": "4.1.1",
"fast-async": "^6.1.2",
"remix-lib": "0.4.15", "remix-lib": "0.4.15",
"web3": "0.20.6" "web3": "0.20.6"
}, },
......
'use strict' 'use strict'
var utileth = require('ethereumjs-util') var utileth = require('ethereumjs-util')
var Tx = require('ethereumjs-tx') var Tx = require('ethereumjs-tx').Transaction
var Block = require('ethereumjs-block') var Block = require('ethereumjs-block')
var BN = require('ethereumjs-util').BN var BN = require('ethereumjs-util').BN
var remixLib = require('remix-lib') var remixLib = require('remix-lib')
...@@ -34,8 +34,7 @@ function sendTx (vm, from, to, value, data, cb) { ...@@ -34,8 +34,7 @@ function sendTx (vm, from, to, value, data, cb) {
Init VM / Send Transaction Init VM / Send Transaction
*/ */
function initVM (st, privateKey) { function initVM (st, privateKey) {
var utileth = require('ethereumjs-util') var VM = require('ethereumjs-vm').default
var VM = require('ethereumjs-vm')
var Web3Providers = remixLib.vm.Web3Providers var Web3Providers = remixLib.vm.Web3Providers
var address = utileth.privateToAddress(privateKey) var address = utileth.privateToAddress(privateKey)
var vm = new VM({ var vm = new VM({
......
'use strict' 'use strict'
var utileth = require('ethereumjs-util') var utileth = require('ethereumjs-util')
var Tx = require('ethereumjs-tx') var Tx = require('ethereumjs-tx').Transaction
var Block = require('ethereumjs-block') var Block = require('ethereumjs-block')
var BN = require('ethereumjs-util').BN var BN = require('ethereumjs-util').BN
var remixLib = require('remix-lib') var remixLib = require('remix-lib')
...@@ -34,8 +34,7 @@ function sendTx (vm, from, to, value, data, cb) { ...@@ -34,8 +34,7 @@ function sendTx (vm, from, to, value, data, cb) {
Init VM / Send Transaction Init VM / Send Transaction
*/ */
function initVM (st, privateKey) { function initVM (st, privateKey) {
var utileth = require('ethereumjs-util') var VM = require('ethereumjs-vm').default
var VM = require('ethereumjs-vm')
var Web3Providers = remixLib.vm.Web3Providers var Web3Providers = remixLib.vm.Web3Providers
var address = utileth.privateToAddress(privateKey) var address = utileth.privateToAddress(privateKey)
var vm = new VM({ var vm = new VM({
......
...@@ -70,10 +70,10 @@ module.exports = { ...@@ -70,10 +70,10 @@ module.exports = {
error: false, error: false,
message: '' message: ''
} }
if (!txResult.result.vm.exceptionError) { if (!txResult.result.execResult.exceptionError) {
return ret return ret
} }
var exceptionError = txResult.result.vm.exceptionError.error || '' var exceptionError = txResult.result.execResult.exceptionError.error || ''
var error = `VM error: ${exceptionError}.\n` var error = `VM error: ${exceptionError}.\n`
var msg var msg
if (exceptionError === errorCode.INVALID_OPCODE) { if (exceptionError === errorCode.INVALID_OPCODE) {
...@@ -83,7 +83,7 @@ module.exports = { ...@@ -83,7 +83,7 @@ module.exports = {
msg = `\tThe transaction ran out of gas. Please increase the Gas Limit.\n` msg = `\tThe transaction ran out of gas. Please increase the Gas Limit.\n`
ret.error = true ret.error = true
} else if (exceptionError === errorCode.REVERT) { } else if (exceptionError === errorCode.REVERT) {
var returnData = txResult.result.vm.return var returnData = txResult.result.execResult.returnValue
// It is the hash of Error(string) // It is the hash of Error(string)
if (returnData && (returnData.slice(0, 4).toString('hex') === '08c379a0')) { if (returnData && (returnData.slice(0, 4).toString('hex') === '08c379a0')) {
var abiCoder = new ethers.utils.AbiCoder() var abiCoder = new ethers.utils.AbiCoder()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment