update test cases

* remove evmone (they are all Prague based) * remove evmone exclusions * use eip7692@v2.0.0 for eest * port in EXTDELEGATE precompile fix * remove references to test directories that are not valid with current specs
bluealloy · Oct 24, 2024 · ac86c0f · ac86c0f
1 parent a1ce5c2
commit ac86c0f
Show file tree

Hide file tree

Showing 449 changed files with 22,609 additions and 12,425 deletions.
diff --git a/.github/workflows/ethereum-tests.yml b/.github/workflows/ethereum-tests.yml
@@ -48,14 +48,10 @@ jobs:
             ethtests/EIPTests/StateTests/stEIP1153-transientStorage/ \
             ethtests/EIPTests/StateTests/stEIP4844-blobtransactions/ \
             ethtests/EIPTests/StateTests/stEIP2537/ \
-            ethtests/EIPTests/StateTests/stEOF \
             tests/eof_suite/eest/state_tests \
-            tests/eof_suite/evmone/state_tests \
             tests/prague_suite/state_tests
       - name: Run EOF validation tests
         run: |
           cross run --target ${{matrix.target}} --profile ${{ matrix.profile }} -p revme -- eof-validation \
-          ethtests/EOFTests \
-          tests/eof_suite/eest/eof_tests/prague \
-          tests/eof_suite/evmone/eof_tests
+          tests/eof_suite/eest/eof_tests/osaka
 
diff --git a/bins/revme/src/cmd/statetest/runner.rs b/bins/revme/src/cmd/statetest/runner.rs
@@ -131,17 +131,6 @@ fn skip_test(path: &Path) -> bool {
         | "static_Call50000_sha256.json"
         | "loopMul.json"
         | "CALLBlake2f_MaxRounds.json"
-
-        // evmone statetest
-        | "initcode_transaction_before_prague.json"
-        | "invalid_tx_non_existing_sender.json"
-        | "tx_non_existing_sender.json"
-        | "block_apply_withdrawal.json"
-        | "block_apply_ommers_reward.json"
-        | "known_block_hash.json"
-        | "eip7516_blob_base_fee.json"
-        | "create_tx_collision_storage.json"
-        | "create_collision_storage.json"
     )
 }
 

diff --git a/crates/revm/src/context/evm_context.rs b/crates/revm/src/context/evm_context.rs
@@ -203,7 +203,14 @@ where
             _ => {}
         };
 
-        if let Some(result) = self.call_precompile(&inputs.bytecode_address, &inputs.input, gas)? {
+        let is_ext_delegate = inputs.scheme.is_ext_delegate_call();
+
+        if let Some(result) = self.call_precompile(
+            &inputs.bytecode_address,
+            &inputs.input,
+            gas,
+            is_ext_delegate,
+        )? {
             if matches!(result.result, return_ok!()) {
                 self.journaled_state.checkpoint_commit();
             } else {
@@ -224,9 +231,7 @@ where
             let mut bytecode = account.info.code.clone().unwrap_or_default();
 
             // ExtDelegateCall is not allowed to call non-EOF contracts.
-            if inputs.scheme.is_ext_delegate_call()
-                && !bytecode.bytes_slice().starts_with(&EOF_MAGIC_BYTES)
-            {
+            if is_ext_delegate && !bytecode.bytes_slice().starts_with(&EOF_MAGIC_BYTES) {
                 return return_result(InstructionResult::InvalidExtDelegateCallTarget);
             }
 

diff --git a/tests/eof_suite/eest/.meta/assets/style.css b/tests/eof_suite/eest/.meta/assets/style.css
diff --git a/...iner/all_invalid_terminating_opcodes.json → ...iner/all_invalid_terminating_opcodes.json b/...iner/all_invalid_terminating_opcodes.json → ...iner/all_invalid_terminating_opcodes.json
diff --git a/...n_container/all_opcodes_in_container.json → ...n_container/all_opcodes_in_container.json b/...n_container/all_opcodes_in_container.json → ...n_container/all_opcodes_in_container.json
diff --git a/...container/all_opcodes_stack_overflow.json → ...container/all_opcodes_stack_overflow.json b/...container/all_opcodes_stack_overflow.json → ...container/all_opcodes_stack_overflow.json
diff --git a/...ontainer/all_opcodes_stack_underflow.json → ...ontainer/all_opcodes_stack_underflow.json b/...ontainer/all_opcodes_stack_underflow.json → ...ontainer/all_opcodes_stack_underflow.json
diff --git a/...hable_terminating_opcodes_after_stop.json → ...hable_terminating_opcodes_after_stop.json b/...hable_terminating_opcodes_after_stop.json → ...hable_terminating_opcodes_after_stop.json
diff --git a/...able_terminating_opcodes_before_stop.json → ...able_terminating_opcodes_before_stop.json b/...able_terminating_opcodes_before_stop.json → ...able_terminating_opcodes_before_stop.json
diff --git a/...v1/container_size/above_max_size_raw.json → ...v1/container_size/above_max_size_raw.json b/...v1/container_size/above_max_size_raw.json → ...v1/container_size/above_max_size_raw.json
diff --git a/...p3540_eof_v1/container_size/max_size.json → ...p3540_eof_v1/container_size/max_size.json b/...p3540_eof_v1/container_size/max_size.json → ...p3540_eof_v1/container_size/max_size.json
diff --git a/..._size/section_after_end_of_container.json → ..._size/section_after_end_of_container.json b/..._size/section_after_end_of_container.json → ..._size/section_after_end_of_container.json
diff --git a/...tainer_validation/invalid_containers.json → ...tainer_validation/invalid_containers.json b/...tainer_validation/invalid_containers.json → ...tainer_validation/invalid_containers.json
diff --git a/...ontainer_validation/magic_validation.json → ...ontainer_validation/magic_validation.json b/...ontainer_validation/magic_validation.json → ...ontainer_validation/magic_validation.json
diff --git a/...ntainer_validation/max_code_sections.json → ...ntainer_validation/max_code_sections.json b/...ntainer_validation/max_code_sections.json → ...ntainer_validation/max_code_sections.json
diff --git a/...ainer_validation/single_code_section.json → ...ainer_validation/single_code_section.json b/...ainer_validation/single_code_section.json → ...ainer_validation/single_code_section.json
diff --git a/...ontainer_validation/valid_containers.json → ...ontainer_validation/valid_containers.json b/...ontainer_validation/valid_containers.json → ...ontainer_validation/valid_containers.json