new(tests): extend RJUMP* to self tests with variadic stack

Extend the existing RJUMP/RJUMPI/RJUMPV to self with
variadic stack height by parametrized spread.

This finishes conversion of jump to self from ethereum/tests.

Author: chfast

Diff for: converted-ethereum-tests.txt

@@ -47,15 +47,17 @@ EOFTests/efStack/forwards_rjumpv_variable_stack_.json
 EOFTests/efStack/underflow_.json
 EOFTests/efStack/underflow_variable_stack_.json
 EOFTests/efStack/unreachable_instructions_.json
+EOFTests/efStack/self_referencing_jumps_.json
+EOFTests/efStack/self_referencing_jumps_variable_stack_.json
 EOFTests/efValidation/callf_into_nonreturning_.json
 EOFTests/efValidation/dataloadn_.json
 EOFTests/efValidation/EOF1_embedded_container_.json
 EOFTests/efValidation/EOF1_eofcreate_valid_.json
 EOFTests/efValidation/EOF1_callf_truncated_.json
 EOFTests/efValidation/EOF1_code_section_missing_.json
 EOFTests/efValidation/EOF1_dataloadn_truncated_.json
-EOFTests/efValidation/EOF1_eofcreate_invalid_.py
-EOFTests/efValidation/EOF1_multiple_type_sections_.py
+EOFTests/efValidation/EOF1_eofcreate_invalid_.json
+EOFTests/efValidation/EOF1_multiple_type_sections_.json
 EOFTests/efValidation/EOF1_no_type_section_.json
 EOFTests/efValidation/EOF1_valid_rjump_.json
 EOFTests/efValidation/EOF1_valid_rjumpi_.json

Diff for: tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjump.py

@@ -6,6 +6,7 @@
 from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types.eof.v1 import Container, Section
 from ethereum_test_types.eof.v1.constants import MAX_BYTECODE_SIZE
+from ethereum_test_vm import Bytecode
 
 from .. import EOF_FORK_NAME
 from .helpers import JumpDirection, slot_code_worked, value_code_worked
@@ -249,12 +250,19 @@ def test_rjump_into_self_remaining_code(
     )
 
 
+@pytest.mark.parametrize("stack_height_spread", [-1, 0, 1, 2])
 def test_rjump_into_self(
     eof_test: EOFTestFiller,
+    stack_height_spread: int,
 ):
     """EOF code containing RJUMP with target self RJUMP."""
+    # Create variadic stack height by the parametrized spread.
+    stack_spread_code = Bytecode()
+    if stack_height_spread >= 0:
+        stack_spread_code = Op.RJUMPI[stack_height_spread](0) + Op.PUSH0 * stack_height_spread
+
     eof_test(
-        container=Container.Code(Op.RJUMP[-len(Op.RJUMP[0])]),
+        container=Container.Code(stack_spread_code + Op.RJUMP[-len(Op.RJUMP[0])]),
     )
 
 

Diff for: tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpi.py

@@ -15,6 +15,7 @@
 from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types.eof.v1 import Container, Section
 from ethereum_test_types.eof.v1.constants import MAX_BYTECODE_SIZE
+from ethereum_test_vm import Bytecode
 
 from .. import EOF_FORK_NAME
 from .helpers import (
@@ -1069,15 +1070,25 @@ def test_rjumpi_into_self_data_portion(
     )
 
 
+@pytest.mark.parametrize("stack_height_spread", [-1, 0, 1, 2])
 def test_rjumpi_into_self(
     eof_test: EOFTestFiller,
+    stack_height_spread: int,
 ):
-    """EOF1I4200_0021 (Invalid) EOF code containing RJUMPI with target same RJUMPI immediate."""
+    """
+    EOF code containing RJUMPI targeting itself (-3).
+    This can never be valid because this is backward jump and RJUMPI consumes one stack item.
+    """
+    # Create variadic stack height by the parametrized spread.
+    stack_spread_code = Bytecode()
+    if stack_height_spread >= 0:
+        stack_spread_code = Op.RJUMPI[stack_height_spread](0) + Op.PUSH0 * stack_height_spread
+
     eof_test(
         container=Container(
             sections=[
                 Section.Code(
-                    code=Op.PUSH1(1) + Op.RJUMPI[-len(Op.RJUMPI[0])] + Op.STOP,
+                    code=stack_spread_code + Op.RJUMPI[-len(Op.RJUMPI[0])](0) + Op.STOP,
                 )
             ],
         ),

Diff for: tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpv.py

@@ -5,6 +5,7 @@
 from ethereum_test_tools import Account, EOFException, EOFStateTestFiller, EOFTestFiller
 from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types.eof.v1 import Container, Section
+from ethereum_test_vm import Bytecode
 
 from .. import EOF_FORK_NAME
 from .helpers import JumpDirection, slot_code_worked, slot_conditional_result, value_code_worked
@@ -481,20 +482,31 @@ def test_rjumpv_into_self_data_portion(
         pytest.param(256, 255, id="t256i255"),
     ],
 )
+@pytest.mark.parametrize("stack_height_spread", [-1, 0, 1, 2])
 def test_rjumpv_into_self(
     eof_test: EOFTestFiller,
     table_size: int,
     invalid_index: int,
+    stack_height_spread: int,
 ):
-    """EOF code containing RJUMPV with target same RJUMPV immediate."""
+    """
+    EOF code containing RJUMPV targeting itself.
+    This can never be valid because this is backward jump and RJUMPV consumes one stack item.
+    """
+    # Create variadic stack height by the parametrized spread.
+    stack_spread_code = Bytecode()
+    if stack_height_spread >= 0:
+        stack_spread_code = Op.RJUMPI[stack_height_spread](0) + Op.PUSH0 * stack_height_spread
+
     jump_table = [0 for _ in range(table_size)]
     jump_table[invalid_index] = -len(Op.RJUMPV[jump_table])
 
     eof_test(
         container=Container(
             sections=[
                 Section.Code(
-                    code=Op.PUSH1(1) + Op.RJUMPV[jump_table] + Op.STOP,
+                    code=stack_spread_code + Op.RJUMPV[jump_table](0) + Op.STOP,
+                    # max stack increase is computed correctly
                 )
             ],
         ),
@@ -517,13 +529,13 @@ def test_rjumpv_into_stack_height_diff(
 ):
     """EOF code containing RJUMPV with target instruction that causes stack height difference."""
     jump_table = [0 for _ in range(table_size)]
-    jump_table[invalid_index] = -(len(Op.RJUMPV[jump_table]) + len(Op.PUSH1(0)) + len(Op.PUSH1(0)))
+    jump_table[invalid_index] = -(len(Op.RJUMPV[jump_table]) + len(Op.PUSH1[0]) + len(Op.PUSH1[0]))
 
     eof_test(
         container=Container(
             sections=[
                 Section.Code(
-                    code=Op.PUSH1(0) + Op.PUSH1(0) + Op.RJUMPV[jump_table] + Op.STOP,
+                    code=Op.PUSH1[0] + Op.PUSH1[0] + Op.RJUMPV[jump_table] + Op.STOP,
                 ),
             ],
         ),

Diff for: tests/osaka/eip7692_eof_v1/eof_tracker.md

@@ -183,6 +183,7 @@
 - [x] Valid RJUMP forwards from different stack in variable stack segment ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjump.py::test_rjump_valid_forward`](./eip4200_relative_jumps/test_rjump/test_rjump_valid_forward.md)
 - [ ] Valid empty infinite loop with RJUMP (ethereum/tests: src/EOFTestsFiller/EIP5450/validInvalidFiller.yml)
 - [ ] Valid balanced infinite loop (ethereum/tests: src/EOFTestsFiller/EIP5450/validInvalidFiller.yml)
+- [x] RJUMP to self (including variadic stack height) ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjump.py::test_rjump_into_self`](./eip4200_relative_jumps/test_rjump/test_rjump_into_self.md))
 
 ##### RJUMPI
 
@@ -203,6 +204,7 @@
 - [x] If-then-else with equal stack height in branches, variable stack segment ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpi.py::test_rjumpi_valid_forward`](./eip4200_relative_jumps/test_rjumpi/test_rjumpi_valid_forward.md)
 - [x] If-then-else with different stack height in branches ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpi.py::test_rjumpi_valid_forward`](./eip4200_relative_jumps/test_rjumpi/test_rjumpi_valid_forward.md)
 - [x] If-then-else with different stack height in branches, variable stack segment ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpi.py::test_rjumpi_valid_forward`](./eip4200_relative_jumps/test_rjumpi/test_rjumpi_valid_forward.md)
+- [x] RJUMPI to self (including variadic stack height) ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpi.py::test_rjumpi_into_self`](./eip4200_relative_jumps/test_rjumpi/test_rjumpi_into_self.md))
 
 ##### RJUMPV
 
@@ -219,6 +221,7 @@
 - [x] Switch with equal stack height in branches, variable stack segment ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpv.py::test_rjumpv_valid_forward`](./eip4200_relative_jumps/test_rjumpv/test_rjumpv_valid_forward.md)
 - [x] Switch with different stack height in branches ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpv.py::test_rjumpv_valid_forward`](./eip4200_relative_jumps/test_rjumpv/test_rjumpv_valid_forward.md)
 - [x] Switch with different stack height in branches, variable stack segment ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpv.py::test_rjumpv_valid_forward`](./eip4200_relative_jumps/test_rjumpv/test_rjumpv_valid_forward.md)
+- [x] RJUMPV to self (including variadic stack height) ([`tests/osaka/eip7692_eof_v1/eip4200_relative_jumps/test_rjumpv.py::test_rjumpv_into_self`](./eip4200_relative_jumps/test_rjumpv/test_rjumpv_into_self.md))
 
 ##### Combinations
 
@@ -232,9 +235,6 @@
 - [ ] RJUMP and RJUMPV with the same target and different stack height in a variable stack segment (ethereum/tests: src/EOFTestsFiller/efStack/forwards_rjumpv_variable_stack_Copier.json)
 - [ ] RJUMPI and RJUMPV with the same target
 
-- [ ] RJUMP* to self (ethereum/tests: src/EOFTestsFiller/efStack/self_referencing_jumps_Copier.json)
-- [ ] RJUMP* to self in a variable stack segment (ethereum/tests: src/EOFTestsFiller/efStack/self_referencing_jumps_variable_stack_Copier.json)
-
 #### Stack underflow
 
 - [x] Stack underflows ([`tests/osaka/eip7692_eof_v1/eip5450_stack/test_code_validation.py::test_all_opcodes_stack_underflow`](./eip5450_stack/test_code_validation/test_all_opcodes_stack_underflow.md))