[WIP] Implement subroutine opcodes

Author: Peppece

eth/vm/forks/berlin/opcodes.py

@@ -22,12 +22,12 @@
 	opcode_values.JUMPSUB: as_opcode(
 		logic_fn = flow.jumpsub,
 		mnemonic = mnemonics.JUMPSUB,
-		gas_cost = constants.GAS_MID,
+		gas_cost = constants.GAS_HIGH,
 	),
 	opcode_values.RETURNSUB: as_opcode(
 		logic_fn = flow.returnsub,
 		mnemonic = mnemonics.RETURNSUB,
-		gas_cost = constants.GAS_VERYLOW,
+		gas_cost = constants.GAS_LOW,
 	),
 }
 

eth/vm/logic/flow.py

@@ -71,20 +71,19 @@ def jumpsub(computation: BaseComputation) -> None:
 
     if computation.code.is_valid_opcode(sub_loc):
 
-        sub_op = computation.code.is_valid_opcode(sub_loc)
+        sub_op = computation.code[sub_loc]
 
         if sub_op == BEGINSUB:
             temp = computation.code.program_counter
             computation.code.program_counter = sub_loc + 1
-            computation.rstack_push_int(temp + 1)
+            computation.rstack_push_int(temp)
 
 
 def returnsub(computation: BaseComputation) -> None:
-
     try:
         ret_loc = computation.rstack_pop1_int()
     except InsufficientStack:
-        pass
+        raise InsufficientStack("Error: at pc={}, op=RETURNSUB: invalid retsub".format(computation.code.program_counter))
 
 
     computation.code.program_counter = ret_loc

eth/vm/opcode_values.py

@@ -91,13 +91,16 @@
 MSIZE = 0x59
 GAS = 0x5a
 JUMPDEST = 0x5b
+
+
 #
 # Subroutines
 #
 BEGINSUB = 0x5c
 RETURNSUB = 0x5d
 JUMPSUB = 0x5e
 
+
 #
 # Push Operations
 #

eth/vm/rstack.py

@@ -36,7 +36,7 @@ def __init__(self) -> None:
         self._pop_typed = values.pop
         self.__len__ = values.__len__
 
-    def push_int(self) -> int:
+    def push_int(self, value) -> int:
         if len(self.values) > 1023:
             raise FullStack('Stack limit reached')