[WIP] Implement subroutine opcodes

Author: Peppece

eth/vm/logic/flow.py

@@ -63,11 +63,15 @@ def gas(computation: BaseComputation) -> None:
 
 
 def beginsub(computation: BaseComputation) -> None:
-    raise OutOfGas
+    raise OutOfGas("Error: at pc={}, op=BEGINSUB: invalid subroutine entry")
 
 
 def jumpsub(computation: BaseComputation) -> None:
     sub_loc = computation.stack_pop1_int()
+    code_range_length = computation.code._length_cache
+
+    if sub_loc >= code_range_length:
+        raise InvalidJumpDestination("Error: at pc={}, op=JUMPSUB: invalid jump destination".format(computation.code.program_counter))
 
     if computation.code.is_valid_opcode(sub_loc):
 

tests/core/opcodes/test_opcodes.py

@@ -1127,7 +1127,6 @@ def test_blake2b_f_compression(vm_class, input_hex, output_hex, expect_exception
         result = comp.output
         assert result.hex() == output_hex
 
-
 @pytest.mark.parametrize(
     'vm_class, code, expect_gas_used',
     (
@@ -1143,32 +1142,45 @@ def test_blake2b_f_compression(vm_class, input_hex, output_hex, expect_exception
         ),
         (
             BerlinVM,
-            '0x6801000000000000000c5e005c60115e5d5c5d',
+            '0x6005565c5d5b60035e',
             0,
         ),
+    )
+)
+def test_jumpsub(vm_class, code, expect_gas_used):
+    computation = setup_computation(vm_class, CANONICAL_ADDRESS_B, decode_hex(code))
+    comp = computation.apply_message(
+        computation.state,
+        computation.msg,
+        computation.transaction_context,
+    )
+    assert comp.is_success
+    assert comp.get_gas_used() == expect_gas_used
+
+@pytest.mark.xfail(reason="invalid subroutines")
+@pytest.mark.parametrize(
+    'vm_class, code',
+    (
         (
             BerlinVM,
             '0x5d5858',
-            0,
         ),
         (
             BerlinVM,
-            '0x6005565c5d5b60035e',
-            30,
+            '0x6801000000000000000c5e005c60115e5d5c5d',
         ),
         (
             BerlinVM,
             '0x5c5d00',
-            0,
         ),
     )
 )
-def test_jumpsub(vm_class, code, expect_gas_used):
+def test_jumpsub(vm_class, code):
     computation = setup_computation(vm_class, CANONICAL_ADDRESS_B, decode_hex(code))
     comp = computation.apply_message(
         computation.state,
         computation.msg,
         computation.transaction_context,
     )
     assert comp.is_success
-    assert comp.get_gas_used() == expect_gas_used
+