diff --git a/remix-lib/src/web3Provider/web3VmProvider.js b/remix-lib/src/web3Provider/web3VmProvider.js index 189a44617e..17f3a644a7 100644 --- a/remix-lib/src/web3Provider/web3VmProvider.js +++ b/remix-lib/src/web3Provider/web3VmProvider.js @@ -122,6 +122,7 @@ web3VmProvider.prototype.txProcessed = function (self, data) { } self.txsReceipt[self.processingHash].logs = logs self.txsReceipt[self.processingHash].transactionHash = self.processingHash + self.txsReceipt[self.processingHash].status = '0x' + data.vm.exception.toString(16) if (data.createdAddress) { var address = util.hexConvert(data.createdAddress) diff --git a/remix-simulator/package.json b/remix-simulator/package.json index f024401e6f..1e5510f4b3 100644 --- a/remix-simulator/package.json +++ b/remix-simulator/package.json @@ -15,6 +15,7 @@ "main": "./index.js", "dependencies": { "ansi-gray": "^0.1.1", + "babel-eslint": "^7.1.1", "babel-plugin-transform-object-assign": "^6.22.0", "babel-preset-es2017": "^6.24.1", "babelify": "^7.3.0", @@ -23,7 +24,7 @@ "express": "^4.16.3", "fast-async": "^6.3.7", "merge": "^1.2.0", - "remix-lib": "^0.2.5", + "remix-lib": "0.3.10", "standard": "^10.0.3", "time-stamp": "^2.0.0", "web3": "1.0.0-beta.27" diff --git a/remix-simulator/src/methods/transactions.js b/remix-simulator/src/methods/transactions.js index 53834ea7dd..1e0f315d2c 100644 --- a/remix-simulator/src/methods/transactions.js +++ b/remix-simulator/src/methods/transactions.js @@ -39,7 +39,7 @@ Transactions.prototype.eth_getTransactionReceipt = function (payload, cb) { 'cumulativeGasUsed': '0x06345f', 'contractAddress': receipt.contractAddress, 'logs': receipt.logs, - 'status': 1 + 'status': receipt.status } cb(null, r) diff --git a/remix-tests/package.json b/remix-tests/package.json index c069cc67a5..fff8f71330 100644 --- a/remix-tests/package.json +++ b/remix-tests/package.json @@ -47,7 +47,7 @@ "signale": "^1.2.1", "solc": "^0.4.24", "standard": "^10.0.3", - "web3": "1.0.0-beta.34", + "web3": "1.0.0-beta.36", "winston": "^3.0.0" }, "peerDependencies": { diff --git a/remix-tests/src/compiler.js b/remix-tests/src/compiler.js index d143db5f43..476c8ea881 100644 --- a/remix-tests/src/compiler.js +++ b/remix-tests/src/compiler.js @@ -71,7 +71,7 @@ function compileFileOrFiles (filename, isDirectory, opts, cb) { }) } -function compileContractSources (sources, importFileCb, cb, opts) { +function compileContractSources (sources, importFileCb, opts, cb) { let compiler, filepath let accounts = opts.accounts || [] // Iterate over sources keys. Inject test libraries. Inject test library import statements. diff --git a/remix-tests/src/index.js b/remix-tests/src/index.js index baf9c8d674..91aa7e3a01 100644 --- a/remix-tests/src/index.js +++ b/remix-tests/src/index.js @@ -29,7 +29,7 @@ var runTestSources = function (contractSources, testCallback, resultCallback, fi }) }, function compile (next) { - Compiler.compileContractSources(contractSources, importFileCb, next) + Compiler.compileContractSources(contractSources, importFileCb, { accounts }, next) }, function deployAllContracts (compilationResult, next) { Deployer.deployAll(compilationResult, web3, function (err, contracts) { diff --git a/remix-tests/src/testRunner.js b/remix-tests/src/testRunner.js index c22dba71e2..7c804b91c9 100644 --- a/remix-tests/src/testRunner.js +++ b/remix-tests/src/testRunner.js @@ -133,8 +133,8 @@ function runTest (testName, testObject, contractDetails, opts, testCallback, res next(err) }) } - }, function () { - resultsCallback(null, { + }, function (error) { + resultsCallback(error, { passingNum: passingNum, failureNum: failureNum, timePassed: timePassed