rcpdaemon: error messages in TraceTracer (#1960)

update rpc-tests version in integration tests
erigontech · Apr 12, 2024 · 8399a2e · 8399a2e
1 parent 615fba0
commit 8399a2e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/rpc-integration-tests.yml b/.github/workflows/rpc-integration-tests.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Checkout RPC Tests Repository & Install Requirements
         run: |
           rm -rf ${{runner.workspace}}/rpc-tests
-          git -c advice.detachedHead=false clone --depth 1 --branch v0.8.2 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
+          git -c advice.detachedHead=false clone --depth 1 --branch v0.9.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
           cd ${{runner.workspace}}/rpc-tests
           pip3 install -r requirements.txt
 

diff --git a/silkworm/rpc/core/evm_trace.cpp b/silkworm/rpc/core/evm_trace.cpp
@@ -852,16 +852,19 @@ void TraceTracer::on_execution_end(const evmc_result& result, const silkworm::In
             trace.trace_result.reset();
             break;
         case evmc_status_code::EVMC_UNDEFINED_INSTRUCTION:
-        case evmc_status_code::EVMC_INVALID_INSTRUCTION:
             trace.error = "bad instruction";
             trace.trace_result.reset();
             break;
+        case evmc_status_code::EVMC_INVALID_INSTRUCTION:
+            trace.error = "invalid opcode: INVALID";
+            trace.trace_result.reset();
+            break;
         case evmc_status_code::EVMC_STACK_UNDERFLOW:
             trace.error = "stack underflow";
             trace.trace_result.reset();
             break;
         case evmc_status_code::EVMC_BAD_JUMP_DESTINATION:
-            trace.error = "bad jump destination";
+            trace.error = "invalid jump destination";
             trace.trace_result.reset();
             break;
         default:
@@ -928,16 +931,19 @@ void TraceTracer::on_reward_granted(const silkworm::CallResult& result, const si
             trace.trace_result.reset();
             break;
         case evmc_status_code::EVMC_UNDEFINED_INSTRUCTION:
-        case evmc_status_code::EVMC_INVALID_INSTRUCTION:
             trace.error = "bad instruction";
             trace.trace_result.reset();
             break;
+        case evmc_status_code::EVMC_INVALID_INSTRUCTION:
+            trace.error = "invalid opcode: INVALID";
+            trace.trace_result.reset();
+            break;
         case evmc_status_code::EVMC_STACK_UNDERFLOW:
             trace.error = "stack underflow";
             trace.trace_result.reset();
             break;
         case evmc_status_code::EVMC_BAD_JUMP_DESTINATION:
-            trace.error = "bad jump destination";
+            trace.error = "invalid jump destination";
             trace.trace_result.reset();
             break;
         default: