From 85e4fd09b1c4c545a7ef72c619f3ed80a8b01823 Mon Sep 17 00:00:00 2001 From: Sixtysixter <20945591+Sixtysixter@users.noreply.github.com> Date: Sun, 14 Apr 2024 01:08:06 +0200 Subject: [PATCH] rpcdaemon: author value in trace_block reward action (#1961) --- .github/workflows/rpc-integration-tests.yml | 4 ++-- silkworm/rpc/core/evm_trace.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rpc-integration-tests.yml b/.github/workflows/rpc-integration-tests.yml index 7fbc018794..ca83c1f69f 100644 --- 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.9.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests + git -c advice.detachedHead=false clone --depth 1 --branch v0.10.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests cd ${{runner.workspace}}/rpc-tests pip3 install -r requirements.txt @@ -68,7 +68,7 @@ jobs: rm -rf ./mainnet/results/ # Run RPC integration test runner via http - python3 ./run_tests.py --continue --blockchain mainnet --jwt ${{runner.workspace}}/silkworm/build/cmd/jwt.hex --display-only-fail --port 8545 -x admin_,eth_mining,eth_getWork,eth_coinbase,eth_createAccessList/test_16.json,engine_ --transport_type http,websocket + python3 ./run_tests.py --continue --blockchain mainnet --jwt ${{runner.workspace}}/silkworm/build/cmd/jwt.hex --display-only-fail --port 8545 -x admin_,eth_mining,eth_getWork,eth_coinbase,eth_createAccessList/test_16.json,engine_,net_,web3_,txpool_,eth_submitWork,eth_submitHashrate,eth_protocolVersion,erigon_nodeInfo --transport_type http,websocket # Capture test runner script exit status test_exit_status=$? diff --git a/silkworm/rpc/core/evm_trace.cpp b/silkworm/rpc/core/evm_trace.cpp index ac709ac472..368c448549 100644 --- a/silkworm/rpc/core/evm_trace.cpp +++ b/silkworm/rpc/core/evm_trace.cpp @@ -1242,10 +1242,11 @@ Task> TraceCallExecutor::trace_block(const BlockWithHash& blo } } + std::size_t index{0}; for (auto& ommer_reward : block_rewards.ommers) { RewardAction action; - action.author = block_with_hash.block.header.beneficiary; /* to be fixed */ - action.reward_type = "block"; + action.author = block_with_hash.block.ommers[index].beneficiary; + action.reward_type = "uncle"; action.value = ommer_reward; Trace trace;