feat(forks,tests): Osaka (#869)

* refactor(forks): Rename `PragueEIP7692` -> `Osaka` * refactor(docs): Rename `PragueEIP7692` -> `Osaka` * refactor(github): Rename `PragueEIP7692` -> `Osaka` * fix(tox.ini): Osaka * refactor(tests): Move EOF to Osaka * fix(plugins): typo * fix(docs): changelog * fix(tests): create `tests/osaka/__init__.py` * fix(forks): Export `Osaka` * Update tests/osaka/__init__.py Co-authored-by: Danno Ferrin <[email protected]> * fix(docs): tox * Update src/pytest_plugins/filler/gen_test_doc/page_props.py Co-authored-by: danceratopz <[email protected]> * Update src/pytest_plugins/filler/gen_test_doc/gen_test_doc.py Co-authored-by: danceratopz <[email protected]> * Apply suggestions from code review Co-authored-by: danceratopz <[email protected]> * Update tests/osaka/eip7692_eof_v1/eof_tracker.md Co-authored-by: danceratopz <[email protected]> * fix(forks): tox --------- Co-authored-by: Danno Ferrin <[email protected]> Co-authored-by: danceratopz <[email protected]>
ethereum · Oct 8, 2024 · b69e696 · b69e696
1 parent ef3fcd4
commit b69e696
Show file tree

Hide file tree

Showing 73 changed files with 164 additions and 166 deletions.
diff --git a/.github/configs/evm.yaml b/.github/configs/evm.yaml
@@ -10,7 +10,7 @@ eip7692:
   impl: evmone
   repo: ethereum/evmone
   ref: master
-eip7692-prague:
+eip7692-osaka:
   impl: besu
   repo: hyperledger/besu
   ref: main

diff --git a/.github/configs/feature.yaml b/.github/configs/feature.yaml
@@ -12,11 +12,11 @@ develop:
   solc: 0.8.21
 eip7692:
   evm-type: eip7692
-  fill-params: --fork=CancunEIP7692 ./tests/prague
+  fill-params: --fork=CancunEIP7692 ./tests/osaka
   solc: 0.8.21
-eip7692-prague:
-  evm-type: eip7692-prague
-  fill-params: --fork=PragueEIP7692 ./tests/prague -k "not slow"
+eip7692-osaka:
+  evm-type: eip7692-osaka
+  fill-params: --fork=Osaka ./tests/osaka -k "not slow"
   solc: 0.8.21
 pectra-devnet-3:
   evm-type: pectra-devnet-3

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -13,6 +13,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Convert all opcodes validation test `tests/frontier/opcodes/test_all_opcodes.py` ([#748](https://github.com/ethereum/execution-spec-tests/pull/748)).
 - ✨ Update [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) tests for Devnet-3 ([#733](https://github.com/ethereum/execution-spec-tests/pull/733))
 - 🐞 Fix [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702)+EOF tests due to incorrect test expectations and faulty `Conditional` test generator in EOF mode ([#821](https://github.com/ethereum/execution-spec-tests/pull/821))
+- 💥 `PragueEIP7692` fork in tests has been updated to `Osaka` ([#869](https://github.com/ethereum/execution-spec-tests/pull/869))
 
 ### 🛠️ Framework
 
@@ -45,6 +46,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Add `Wei` type to `ethereum_test_base_types` which allows parsing wei amounts from strings like "1 ether", "1000 wei", "10**2 gwei", etc ([#825](https://github.com/ethereum/execution-spec-tests/pull/825)).
 - ✨ Pin EELS versions in `eels_resolutions.json` and include this file in fixture releases ([#872](https://github.com/ethereum/execution-spec-tests/pull/872)).
 - 🔀 Replace `ethereum.base_types` with `ethereum-types` ([#850](https://github.com/ethereum/execution-spec-tests/pull/850)).
+- 💥 `PragueEIP7692` fork has been renamed to `Osaka` ([#869](https://github.com/ethereum/execution-spec-tests/pull/869))
 
 ### 🔧 EVM Tools
 

diff --git a/docs/gen_test_case_reference.py b/docs/gen_test_case_reference.py
@@ -18,7 +18,7 @@
 importlib.reload(gen_test_doc)  # get changes in plugin for use with `mkdocs serve`
 
 logger = logging.getLogger("mkdocs")
-dev_fork = "PragueEIP7692"
+dev_fork = "Osaka"
 args = [
     "--override-ini",
     "filterwarnings=ignore::pytest.PytestAssertRewriteWarning",  # suppress warnings due to reload
@@ -31,7 +31,7 @@
     "-s",
     "tests",
     # "tests/shanghai",
-    # "tests/prague/eip7692_eof_v1",  # noqa: SC100
+    # "tests/osaka/eip7692_eof_v1",  # noqa: SC100
     # "tests/prague/eip2537_bls_12_381_precompiles",  # noqa: SC100
 ]
 

diff --git a/src/ethereum_test_forks/__init__.py b/src/ethereum_test_forks/__init__.py
@@ -16,6 +16,7 @@
     Istanbul,
     London,
     MuirGlacier,
+    Osaka,
     Paris,
     Prague,
     Shanghai,
@@ -66,6 +67,7 @@
     "ShanghaiToCancunAtTime15k",
     "Cancun",
     "Prague",
+    "Osaka",
     "get_transition_forks",
     "forks_from",
     "forks_from_until",

diff --git a/src/ethereum_test_forks/forks/forks.py b/src/ethereum_test_forks/forks/forks.py
@@ -943,7 +943,7 @@ class CancunEIP7692(  # noqa: SC200
     solc_name="cancun",
 ):
     """
-    Cancun + EIP-7692 (EOF) fork
+    Cancun + EIP-7692 (EOF) fork (Deprecated)
     """
 
     @classmethod
@@ -1000,22 +1000,17 @@ def solc_min_version(cls) -> Version:
         return Version.parse("1.0.0")  # set a high version; currently unknown
 
 
-class PragueEIP7692(  # noqa: SC200
-    Prague,
-    transition_tool_name="Prague",  # Besu enables EOF at Prague
-    blockchain_test_network_name="Prague",  # Besu enables EOF at Prague
-    solc_name="cancun",
-):
+class Osaka(Prague, solc_name="cancun"):
     """
-    Prague + EIP-7692 (EOF) fork
+    Osaka fork
     """
 
     @classmethod
     def evm_code_types(cls, block_number: int = 0, timestamp: int = 0) -> List[EVMCodeType]:
         """
-        EOF V1 is supported starting from this fork.
+        EOF V1 is supported starting from Osaka.
         """
-        return super(PragueEIP7692, cls,).evm_code_types(  # noqa: SC200
+        return super(Osaka, cls,).evm_code_types(
             block_number,
             timestamp,
         ) + [EVMCodeType.EOF_V1]
@@ -1031,11 +1026,7 @@ def call_opcodes(
             (Opcodes.EXTCALL, EVMCodeType.EOF_V1),
             (Opcodes.EXTSTATICCALL, EVMCodeType.EOF_V1),
             (Opcodes.EXTDELEGATECALL, EVMCodeType.EOF_V1),
-        ] + super(
-            PragueEIP7692, cls  # noqa: SC200
-        ).call_opcodes(
-            block_number, timestamp
-        )
+        ] + super(Osaka, cls).call_opcodes(block_number, timestamp)
 
     @classmethod
     def is_deployed(cls) -> bool:

diff --git a/src/pytest_plugins/filler/gen_test_doc/gen_test_doc.py b/src/pytest_plugins/filler/gen_test_doc/gen_test_doc.py
@@ -447,7 +447,7 @@ def add_directory_page_props(self) -> None:
                 pytest_node_id=str(directory),
                 source_code_url=generate_github_url(directory, branch_or_commit_or_tag=self.ref),
                 # TODO: This won't work in all cases; should be from the development fork
-                # Currently breaks for `test/prague/eip7692_eof_v1/index.md`  # noqa: SC100
+                # Currently breaks for `tests/osaka/eip7692_eof_v1/index.md`  # noqa: SC100
                 valid_from_fork=fork,
                 package_name=get_import_path(directory),  # init.py will be used for docstrings
             )
@@ -514,8 +514,8 @@ def sort_by_fork_deployment_and_path(x: PageProps) -> Tuple[Any, ...]:
 
             - ("Test Case Reference",) -> tests/index.md
             - ("Test Case Reference", "Berlin") -> tests/berlin/index.md
-            - ("Test Case Reference", "Prague", "EIP-7692 EOF V1", tracker.md")
-                tests/prague/eip7692_eof_v1/tracker.md
+            - ("Test Case Reference", "Osaka", "EIP-7692 EOF V1", tracker.md")
+                tests/osaka/eip7692_eof_v1/tracker.md
             - ("Test Case Reference", "Shanghai", "EIP-3855 PUSH0", "Spec") ->
                 tests/shanghai/eip3855_push0/spec.py
 

diff --git a/src/pytest_plugins/filler/gen_test_doc/page_props.py b/src/pytest_plugins/filler/gen_test_doc/page_props.py
@@ -25,7 +25,7 @@ def apply_name_filters(input_string: str):
     """
     Apply a list of capitalizations/regexes to names used in titles & nav menus.
 
-    Note: As of PragueEIP7692 With 634 doc pages, this function constitutes ~2.0s
+    Note: As of 2024-10-08, with 634 doc pages, this function constitutes ~2.0s
     of the total runtime (~5.5s). This seems to be insignificant with the time
     taken by mkdocstrings to include the docstrings in the final output (which)
     is a separate mkdocs "build-step" occurs outside the scope of this plugin.

diff --git a/tests/osaka/__init__.py b/tests/osaka/__init__.py
@@ -0,0 +1,3 @@
+"""
+Test cases for EVM functionality introduced in Osaka, [EIP-7607: Hardfork Meta - Fusaka](https://eip.directory/eips/eip-7607).
+"""  # noqa: E501
diff --git a/tests/prague/eip7692_eof_v1/__init__.py → tests/osaka/eip7692_eof_v1/__init__.py b/tests/prague/eip7692_eof_v1/__init__.py → tests/osaka/eip7692_eof_v1/__init__.py
@@ -2,4 +2,4 @@
 Test cases for all EIPs mentioned in the EOF V1 meta-EIP.
 """
 
-EOF_FORK_NAME = "CancunEIP7692,PragueEIP7692"
+EOF_FORK_NAME = "CancunEIP7692,Osaka"
diff --git a/...eip7692_eof_v1/eip3540_eof_v1/__init__.py → ...eip7692_eof_v1/eip3540_eof_v1/__init__.py b/...eip7692_eof_v1/eip3540_eof_v1/__init__.py → ...eip7692_eof_v1/eip3540_eof_v1/__init__.py
diff --git a/.../eip7692_eof_v1/eip3540_eof_v1/opcodes.py → .../eip7692_eof_v1/eip3540_eof_v1/opcodes.py b/.../eip7692_eof_v1/eip3540_eof_v1/opcodes.py → .../eip7692_eof_v1/eip3540_eof_v1/opcodes.py
diff --git a/...gue/eip7692_eof_v1/eip3540_eof_v1/spec.py → ...aka/eip7692_eof_v1/eip3540_eof_v1/spec.py b/...gue/eip7692_eof_v1/eip3540_eof_v1/spec.py → ...aka/eip7692_eof_v1/eip3540_eof_v1/spec.py
diff --git a/...0_eof_v1/test_all_opcodes_in_container.py → ...0_eof_v1/test_all_opcodes_in_container.py b/...0_eof_v1/test_all_opcodes_in_container.py → ...0_eof_v1/test_all_opcodes_in_container.py
diff --git a/..._v1/eip3540_eof_v1/test_container_size.py → ..._v1/eip3540_eof_v1/test_container_size.py b/..._v1/eip3540_eof_v1/test_container_size.py → ..._v1/eip3540_eof_v1/test_container_size.py
diff --git a/...p3540_eof_v1/test_container_validation.py → ...p3540_eof_v1/test_container_validation.py b/...p3540_eof_v1/test_container_validation.py → ...p3540_eof_v1/test_container_validation.py
diff --git a/...eof_v1/eip3540_eof_v1/test_eof_example.py → ...eof_v1/eip3540_eof_v1/test_eof_example.py b/...eof_v1/eip3540_eof_v1/test_eof_example.py → ...eof_v1/eip3540_eof_v1/test_eof_example.py
diff --git a/...eip3540_eof_v1/test_execution_function.py → ...eip3540_eof_v1/test_execution_function.py b/...eip3540_eof_v1/test_execution_function.py → ...eip3540_eof_v1/test_execution_function.py
diff --git a/...692_eof_v1/eip3540_eof_v1/test_extcode.py → ...692_eof_v1/eip3540_eof_v1/test_extcode.py b/...692_eof_v1/eip3540_eof_v1/test_extcode.py → ...692_eof_v1/eip3540_eof_v1/test_extcode.py
diff --git a/...540_eof_v1/test_migrated_valid_invalid.py → ...540_eof_v1/test_migrated_valid_invalid.py b/...540_eof_v1/test_migrated_valid_invalid.py → ...540_eof_v1/test_migrated_valid_invalid.py
diff --git a/.../eip3540_eof_v1/test_opcodes_in_legacy.py → .../eip3540_eof_v1/test_opcodes_in_legacy.py b/.../eip3540_eof_v1/test_opcodes_in_legacy.py → .../eip3540_eof_v1/test_opcodes_in_legacy.py
diff --git a/...f_v1/test_section_header_body_mismatch.py → ...f_v1/test_section_header_body_mismatch.py b/...f_v1/test_section_header_body_mismatch.py → ...f_v1/test_section_header_body_mismatch.py
diff --git a/...f_v1/eip3540_eof_v1/test_section_order.py → ...f_v1/eip3540_eof_v1/test_section_order.py b/...f_v1/eip3540_eof_v1/test_section_order.py → ...f_v1/eip3540_eof_v1/test_section_order.py
diff --git a/...of_v1/eip3540_eof_v1/test_section_size.py → ...of_v1/eip3540_eof_v1/test_section_size.py b/...of_v1/eip3540_eof_v1/test_section_size.py → ...of_v1/eip3540_eof_v1/test_section_size.py
diff --git a/...eof_v1/eip4200_relative_jumps/__init__.py → ...eof_v1/eip4200_relative_jumps/__init__.py b/...eof_v1/eip4200_relative_jumps/__init__.py → ...eof_v1/eip4200_relative_jumps/__init__.py
diff --git a/..._eof_v1/eip4200_relative_jumps/helpers.py → ..._eof_v1/eip4200_relative_jumps/helpers.py b/..._eof_v1/eip4200_relative_jumps/helpers.py → ..._eof_v1/eip4200_relative_jumps/helpers.py
diff --git a/...f_v1/eip4200_relative_jumps/test_rjump.py → ...f_v1/eip4200_relative_jumps/test_rjump.py b/...f_v1/eip4200_relative_jumps/test_rjump.py → ...f_v1/eip4200_relative_jumps/test_rjump.py
diff --git a/..._v1/eip4200_relative_jumps/test_rjumpi.py → ..._v1/eip4200_relative_jumps/test_rjumpi.py b/..._v1/eip4200_relative_jumps/test_rjumpi.py → ..._v1/eip4200_relative_jumps/test_rjumpi.py
diff --git a/..._v1/eip4200_relative_jumps/test_rjumpv.py → ..._v1/eip4200_relative_jumps/test_rjumpv.py b/..._v1/eip4200_relative_jumps/test_rjumpv.py → ..._v1/eip4200_relative_jumps/test_rjumpv.py
diff --git a/...7692_eof_v1/eip4750_functions/__init__.py → ...7692_eof_v1/eip4750_functions/__init__.py b/...7692_eof_v1/eip4750_functions/__init__.py → ...7692_eof_v1/eip4750_functions/__init__.py
diff --git a/...p7692_eof_v1/eip4750_functions/helpers.py → ...p7692_eof_v1/eip4750_functions/helpers.py b/...p7692_eof_v1/eip4750_functions/helpers.py → ...p7692_eof_v1/eip4750_functions/helpers.py
diff --git a/...eip4750_functions/test_callf_execution.py → ...eip4750_functions/test_callf_execution.py b/...eip4750_functions/test_callf_execution.py → ...eip4750_functions/test_callf_execution.py
diff --git a/...eip4750_functions/test_code_validation.py → ...eip4750_functions/test_code_validation.py b/...eip4750_functions/test_code_validation.py → ...eip4750_functions/test_code_validation.py
diff --git a/.../eip7692_eof_v1/eip6206_jumpf/__init__.py → .../eip7692_eof_v1/eip6206_jumpf/__init__.py b/.../eip7692_eof_v1/eip6206_jumpf/__init__.py → .../eip7692_eof_v1/eip6206_jumpf/__init__.py
diff --git a/...e/eip7692_eof_v1/eip6206_jumpf/helpers.py → ...a/eip7692_eof_v1/eip6206_jumpf/helpers.py b/...e/eip7692_eof_v1/eip6206_jumpf/helpers.py → ...a/eip7692_eof_v1/eip6206_jumpf/helpers.py
diff --git a/...ague/eip7692_eof_v1/eip6206_jumpf/spec.py → ...saka/eip7692_eof_v1/eip6206_jumpf/spec.py b/...ague/eip7692_eof_v1/eip6206_jumpf/spec.py → ...saka/eip7692_eof_v1/eip6206_jumpf/spec.py
diff --git a/..._v1/eip6206_jumpf/test_jumpf_execution.py → ..._v1/eip6206_jumpf/test_jumpf_execution.py b/..._v1/eip6206_jumpf/test_jumpf_execution.py → ..._v1/eip6206_jumpf/test_jumpf_execution.py
diff --git a/..._eof_v1/eip6206_jumpf/test_jumpf_stack.py → ..._eof_v1/eip6206_jumpf/test_jumpf_stack.py b/..._eof_v1/eip6206_jumpf/test_jumpf_stack.py → ..._eof_v1/eip6206_jumpf/test_jumpf_stack.py
diff --git a/...eof_v1/eip6206_jumpf/test_jumpf_target.py → ...eof_v1/eip6206_jumpf/test_jumpf_target.py b/...eof_v1/eip6206_jumpf/test_jumpf_target.py → ...eof_v1/eip6206_jumpf/test_jumpf_target.py
diff --git a/...206_jumpf/test_nonreturning_validation.py → ...206_jumpf/test_nonreturning_validation.py b/...206_jumpf/test_nonreturning_validation.py → ...206_jumpf/test_nonreturning_validation.py
diff --git a/...v1/eip663_dupn_swapn_exchange/__init__.py → ...v1/eip663_dupn_swapn_exchange/__init__.py b/...v1/eip663_dupn_swapn_exchange/__init__.py → ...v1/eip663_dupn_swapn_exchange/__init__.py
diff --git a/...1/eip663_dupn_swapn_exchange/test_dupn.py → ...1/eip663_dupn_swapn_exchange/test_dupn.py b/...1/eip663_dupn_swapn_exchange/test_dupn.py → ...1/eip663_dupn_swapn_exchange/test_dupn.py
diff --git a/...p663_dupn_swapn_exchange/test_exchange.py → ...p663_dupn_swapn_exchange/test_exchange.py b/...p663_dupn_swapn_exchange/test_exchange.py → ...p663_dupn_swapn_exchange/test_exchange.py
diff --git a/.../eip663_dupn_swapn_exchange/test_swapn.py → .../eip663_dupn_swapn_exchange/test_swapn.py b/.../eip663_dupn_swapn_exchange/test_swapn.py → .../eip663_dupn_swapn_exchange/test_swapn.py
diff --git a/...ip7692_eof_v1/eip7069_extcall/__init__.py → ...ip7692_eof_v1/eip7069_extcall/__init__.py b/...ip7692_eof_v1/eip7069_extcall/__init__.py → ...ip7692_eof_v1/eip7069_extcall/__init__.py
diff --git a/...eip7692_eof_v1/eip7069_extcall/helpers.py → ...eip7692_eof_v1/eip7069_extcall/helpers.py b/...eip7692_eof_v1/eip7069_extcall/helpers.py → ...eip7692_eof_v1/eip7069_extcall/helpers.py
diff --git a/...ue/eip7692_eof_v1/eip7069_extcall/spec.py → ...ka/eip7692_eof_v1/eip7069_extcall/spec.py b/...ue/eip7692_eof_v1/eip7069_extcall/spec.py → ...ka/eip7692_eof_v1/eip7069_extcall/spec.py
diff --git a/...9_extcall/test_address_space_extension.py → ...9_extcall/test_address_space_extension.py b/...9_extcall/test_address_space_extension.py → ...9_extcall/test_address_space_extension.py
diff --git a/...2_eof_v1/eip7069_extcall/test_calldata.py → ...2_eof_v1/eip7069_extcall/test_calldata.py b/...2_eof_v1/eip7069_extcall/test_calldata.py → ...2_eof_v1/eip7069_extcall/test_calldata.py
diff --git a/...7692_eof_v1/eip7069_extcall/test_calls.py → ...7692_eof_v1/eip7069_extcall/test_calls.py b/...7692_eof_v1/eip7069_extcall/test_calls.py → ...7692_eof_v1/eip7069_extcall/test_calls.py
diff --git a/...ip7692_eof_v1/eip7069_extcall/test_gas.py → ...ip7692_eof_v1/eip7069_extcall/test_gas.py b/...ip7692_eof_v1/eip7069_extcall/test_gas.py → ...ip7692_eof_v1/eip7069_extcall/test_gas.py
diff --git a/...l/test_returndatacopy_memory_expansion.py → ...l/test_returndatacopy_memory_expansion.py b/...l/test_returndatacopy_memory_expansion.py → ...l/test_returndatacopy_memory_expansion.py
diff --git a/...v1/eip7069_extcall/test_returndataload.py → ...v1/eip7069_extcall/test_returndataload.py b/...v1/eip7069_extcall/test_returndataload.py → ...v1/eip7069_extcall/test_returndataload.py
diff --git a/...2_eof_v1/eip7480_data_section/__init__.py → ...2_eof_v1/eip7480_data_section/__init__.py b/...2_eof_v1/eip7480_data_section/__init__.py → ...2_eof_v1/eip7480_data_section/__init__.py
diff --git a/...p7692_eof_v1/eip7480_data_section/spec.py → ...p7692_eof_v1/eip7480_data_section/spec.py b/...p7692_eof_v1/eip7480_data_section/spec.py → ...p7692_eof_v1/eip7480_data_section/spec.py
diff --git a/...7480_data_section/test_code_validation.py → ...7480_data_section/test_code_validation.py b/...7480_data_section/test_code_validation.py → ...7480_data_section/test_code_validation.py
diff --git a/...eip7480_data_section/test_data_opcodes.py → ...eip7480_data_section/test_data_opcodes.py b/...eip7480_data_section/test_data_opcodes.py → ...eip7480_data_section/test_data_opcodes.py
diff --git a/...section/test_datacopy_memory_expansion.py → ...section/test_datacopy_memory_expansion.py b/...section/test_datacopy_memory_expansion.py → ...section/test_datacopy_memory_expansion.py
diff --git a/...692_eof_v1/eip7620_eof_create/__init__.py → ...692_eof_v1/eip7620_eof_create/__init__.py b/...692_eof_v1/eip7620_eof_create/__init__.py → ...692_eof_v1/eip7620_eof_create/__init__.py
@@ -7,7 +7,7 @@
 eofcreate_extcall_returncontract - per the new initcode mode tests you cannot have RETURNCONTRACT
     in a deployed contract
 eofcreate_dataloadn_referring_to_auxdata - covered by
-    tests.prague.eip7480_data_section.test_data_opcodes.test_data_section_succeed
+    tests.osaka.eip7480_data_section.test_data_opcodes.test_data_section_succeed
 eofcreate_initcontainer_return - RETURN is banned in initcode containers
 eofcreate_initcontainer_stop - STOP is banned in initcode containers
 All TXCREATE tests - TXCREATE has been removed from Prague

diff --git a/...7692_eof_v1/eip7620_eof_create/helpers.py → ...7692_eof_v1/eip7620_eof_create/helpers.py b/...7692_eof_v1/eip7620_eof_create/helpers.py → ...7692_eof_v1/eip7620_eof_create/helpers.py
diff --git a/...eip7692_eof_v1/eip7620_eof_create/spec.py → ...eip7692_eof_v1/eip7620_eof_create/spec.py b/...eip7692_eof_v1/eip7620_eof_create/spec.py → ...eip7692_eof_v1/eip7620_eof_create/spec.py
diff --git a/...f_v1/eip7620_eof_create/test_eofcreate.py → ...f_v1/eip7620_eof_create/test_eofcreate.py b/...f_v1/eip7620_eof_create/test_eofcreate.py → ...f_v1/eip7620_eof_create/test_eofcreate.py
diff --git a/...620_eof_create/test_eofcreate_failures.py → ...620_eof_create/test_eofcreate_failures.py b/...620_eof_create/test_eofcreate_failures.py → ...620_eof_create/test_eofcreate_failures.py
@@ -676,7 +676,7 @@ def test_eof_eofcreate_msg_depth(
     Test EOFCREATE handles msg depth limit correctly (1024).
     NOTE: due to block gas limit and the 63/64th rule this limit is unlikely to be hit
           on mainnet.
-    NOTE: See `tests/prague/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_msg_depth`
+    NOTE: See `tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_msg_depth`
           for more explanations and comments. Most notable deviation from that test is that here
           calls and `EOFCREATE`s alternate in order to reach the max depth. `who_fails` decides
           whether the failing depth 1024 will be on a call or on an `EOFCREATE` to happen.

diff --git a/...692_eof_v1/eip7620_eof_create/test_gas.py → ...692_eof_v1/eip7620_eof_create/test_gas.py b/...692_eof_v1/eip7620_eof_create/test_gas.py → ...692_eof_v1/eip7620_eof_create/test_gas.py
diff --git a/...620_eof_create/test_legacy_eof_creates.py → ...620_eof_create/test_legacy_eof_creates.py b/...620_eof_create/test_legacy_eof_creates.py → ...620_eof_create/test_legacy_eof_creates.py
diff --git a/...eip7620_eof_create/test_returncontract.py → ...eip7620_eof_create/test_returncontract.py b/...eip7620_eof_create/test_returncontract.py → ...eip7620_eof_create/test_returncontract.py
diff --git a/...of_create/test_subcontainer_validation.py → ...of_create/test_subcontainer_validation.py b/...of_create/test_subcontainer_validation.py → ...of_create/test_subcontainer_validation.py
diff --git a/...of_v1/eip7698_eof_creation_tx/__init__.py → ...of_v1/eip7698_eof_creation_tx/__init__.py b/...of_v1/eip7698_eof_creation_tx/__init__.py → ...of_v1/eip7698_eof_creation_tx/__init__.py
diff --git a/...eof_v1/eip7698_eof_creation_tx/helpers.py → ...eof_v1/eip7698_eof_creation_tx/helpers.py b/...eof_v1/eip7698_eof_creation_tx/helpers.py → ...eof_v1/eip7698_eof_creation_tx/helpers.py
diff --git a/...8_eof_creation_tx/test_eof_creation_tx.py → ...8_eof_creation_tx/test_eof_creation_tx.py b/...8_eof_creation_tx/test_eof_creation_tx.py → ...8_eof_creation_tx/test_eof_creation_tx.py