Merge pull request #307 from ethereumjs/break-on-programmatic-errors

Throw original error and terminate execution on programmatic errors
ethereumjs · Jul 17, 2018 · 0e6d2ff · 0e6d2ff
2 parents 4ecae8a + 9b1a0d0
commit 0e6d2ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/exceptions.js b/lib/exceptions.js
@@ -11,6 +11,7 @@ const ERROR = {
 
 function VmError (error) {
   this.error = error
+  this.errorType = 'VmError'
 }
 
 module.exports = {

diff --git a/lib/runCode.js b/lib/runCode.js
@@ -200,8 +200,12 @@ module.exports = function (opts, cb) {
         // run the opcode
         var result = opFn.apply(null, args)
       } catch (e) {
-        cb(e)
-        return
+        if (e.errorType && e.errorType === 'VmError') {
+          cb(e)
+          return
+        } else {
+          throw e
+        }
       }
 
       // save result to the stack