evm: fix err handling

jochem-brouwer · jochem-brouwer · commit 71e77dc695e5 · 2024-10-01T13:57:38.000+02:00
diff --git a/packages/evm/src/interpreter.ts b/packages/evm/src/interpreter.ts
@@ -338,8 +338,8 @@ export class Interpreter {
         if (overheadTimer !== undefined) {
           this.performanceLogger.unpauseTimer(overheadTimer)
         }
-        // re-throw on non-VM errors
-        if (!('errorType' in e && e.errorType === 'EvmError')) {
+        // re-throw on non-VM-runtime errors
+        if (getRuntimeError(e) === undefined) {
           throw e
         }
         // STOP is not an exception
diff --git a/packages/util/src/errors.ts b/packages/util/src/errors.ts
@@ -18,7 +18,7 @@ export type EthereumJSErrorObject = {
  */
 export class EthereumJSError<T extends { code: string }> extends Error {
   type: T
-  code: string
+  code: string // TODO likely remove this and for error inspection inspect `error.type.code` (like Lodestar)
   constructor(type: T, message?: string, stack?: string) {
     super(message ?? type.code)
     this.type = type

Original file line number	Diff line number	Diff line change
`@@ -338,8 +338,8 @@ export class Interpreter {`
`338`	`338`	`if (overheadTimer !== undefined) {`
`339`	`339`	`this.performanceLogger.unpauseTimer(overheadTimer)`
`340`	`340`	`}`
`341`		`- // re-throw on non-VM errors`
`342`		`- if (!('errorType' in e && e.errorType === 'EvmError')) {`
	`341`	`+ // re-throw on non-VM-runtime errors`
	`342`	`+ if (getRuntimeError(e) === undefined) {`
`343`	`343`	`throw e`
`344`	`344`	`}`
`345`	`345`	`// STOP is not an exception`