Skip to content

fix(rpc/trace): wrong calculate of block ommer rewards #8767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattsse merged 3 commits into from
Jun 12, 2024
Merged

fix(rpc/trace): wrong calculate of block ommer rewards #8767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a53237b
fix(rpc/trace): wrong calculate of block ommer rewards
jsvisa Jun 12, 2024
f85c0cb
clippy
jsvisa Jun 12, 2024
10e6ecb
clippy
jsvisa Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions crates/rpc/rpc/src/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::eth::{
};
use async_trait::async_trait;
use jsonrpsee::core::RpcResult as Result;
use reth_consensus_common::calc::{base_block_reward, block_reward};
use reth_consensus_common::calc::{base_block_reward, block_reward, ommer_reward};
use reth_primitives::{revm::env::tx_env_with_recovered, BlockId, Bytes, SealedHeader, B256, U256};
use reth_provider::{BlockReader, ChainSpecProvider, EvmEnvProvider, StateProviderFactory};
use reth_revm::database::StateProviderDatabase;
Expand Down Expand Up @@ -363,25 +363,25 @@ where
block.header.difficulty,
header_td,
) {
let block_reward = block_reward(base_block_reward, block.ommers.len());
traces.push(reward_trace(
&block.header,
RewardAction {
author: block.header.beneficiary,
reward_type: RewardType::Block,
value: U256::from(base_block_reward),
value: U256::from(block_reward),
},
));

if !block.ommers.is_empty() {
for uncle in &block.ommers {
let uncle_reward =
ommer_reward(base_block_reward, block.header.number, uncle.number);
traces.push(reward_trace(
&block.header,
RewardAction {
author: block.header.beneficiary,
author: uncle.beneficiary,
reward_type: RewardType::Uncle,
value: U256::from(
block_reward(base_block_reward, block.ommers.len()) -
base_block_reward,
),
value: U256::from(uncle_reward),
},
));
}
Expand Down