From ba7d36bbcd131751fe33763bcdd6a53922e35add Mon Sep 17 00:00:00 2001 From: holgerd77 Date: Fri, 14 Aug 2020 09:51:50 +0200 Subject: [PATCH] vm: removed invalid opcode checks for BEGINSUB, JUMPSUB, RETURNSUB (opcodes are now preselected on a HF basis in opcodes.ts) --- packages/vm/lib/evm/opFns.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packages/vm/lib/evm/opFns.ts b/packages/vm/lib/evm/opFns.ts index 481d627157d..3f4345d3ddc 100644 --- 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) }