Merge pull request #796 from ethereum/vmerrorfix

Return string instead of dom element (VM error)
pull/1/head
yann300 7 years ago committed by GitHub
commit 30ef60272a
  1. 2
      package.json
  2. 10
      src/app/execution/txExecution.js

@ -32,7 +32,7 @@
"javascript-serialize": "^1.6.1",
"jquery": "^2.2.0",
"js-base64": "^2.1.9",
"js-beautify": "^1.6.14",
"js-beautify": "1.6.14",
"minixhr": "^3.2.2",
"mkdirp": "^0.5.1",
"nightwatch": "^0.9.3",

@ -1,5 +1,4 @@
'use strict'
var yo = require('yo-yo')
module.exports = {
/**
@ -46,17 +45,16 @@ module.exports = {
if (!txResult.result.vm.exceptionError) {
return ret
}
var error = yo`<span> VM error: ${txResult.result.vm.exceptionError}</span>`
var error = `VM error: ${txResult.result.vm.exceptionError}.\n`
var msg
if (txResult.result.vm.exceptionError === 'invalid opcode') {
msg = yo`<ul><li>The constructor should be payable if you send it value.</li>
<li>The execution might have thrown.</li></ul>`
msg = `\tThe constructor should be payable if you send value.\n\tThe execution might have thrown.\n`
ret.error = true
} else if (txResult.result.vm.exceptionError === 'out of gas') {
msg = yo`<div>The transaction ran out of gas. Please increase the Gas Limit.</div>`
msg = `\tThe transaction ran out of gas. Please increase the Gas Limit.\n`
ret.error = true
}
ret.message = yo`<div>${error} ${msg} Debug the transaction to get more information</div>`
ret.message = `${error}${msg}\tDebug the transaction to get more information.`
return ret
}
}

Loading…
Cancel
Save