vm: removed invalid opcode checks for BEGINSUB, JUMPSUB, RETURNSUB (o…

…pcodes are now preselected on a HF basis in opcodes.ts)
ethereumjs · Aug 14, 2020 · ba7d36b · ba7d36b
1 parent 2a77e2a
commit ba7d36b
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/packages/vm/lib/evm/opFns.ts b/packages/vm/lib/evm/opFns.ts
@@ -547,17 +547,10 @@ export const handlers: { [k: string]: OpHandler } = {
   },
   JUMPDEST: function (runState: RunState) {},
   BEGINSUB: function (runState: RunState) {
-    if (!runState._common.gteHardfork('berlin')) {
-      trap(ERROR.INVALID_OPCODE)
-    }
-
     trap(ERROR.INVALID_BEGINSUB + ' at ' + describeLocation(runState))
   },
   JUMPSUB: function (runState: RunState) {
     const dest = runState.stack.pop()
-    if (!runState._common.gteHardfork('berlin')) {
-      trap(ERROR.INVALID_OPCODE)
-    }
 
     if (dest.gt(runState.eei.getCodeSize())) {
       trap(ERROR.INVALID_JUMPSUB + ' at ' + describeLocation(runState))
@@ -573,10 +566,6 @@ export const handlers: { [k: string]: OpHandler } = {
     runState.programCounter = destNum + 1
   },
   RETURNSUB: function (runState: RunState) {
-    if (!runState._common.gteHardfork('berlin')) {
-      trap(ERROR.INVALID_OPCODE)
-    }
-
     if (runState.returnStack.length < 1) {
       trap(ERROR.INVALID_RETURNSUB)
     }