evm: fix err handling

ethereumjs · Oct 1, 2024 · 71e77dc · 71e77dc
1 parent d00b7bf
commit 71e77dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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