jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make SealedBlock.header field private (#13646)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
DevOrbitlabs
2025-01-08 02:44:39 +07:00
committed by GitHub
parent 3e980e61d8
commit 35392bd8e9
30 changed files with 169 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/rpc/rpc-eth-api/src/helpers/call.rs
View File

@ -126,10 +126,7 @@ pub trait EthCall: EstimateCall + Call + LoadPendingBlock + LoadBlock + FullEthA
base_fee_params,
)
} else {
base_block
.header
.next_block_base_fee(base_fee_params)
.unwrap_or_default()
base_block.next_block_base_fee(base_fee_params).unwrap_or_default()
};
block_env.basefee = U256::from(base_fee);
} else {

4
crates/rpc/rpc-eth-api/src/helpers/trace.rs
View File

@ -496,12 +496,12 @@ pub trait Trace:
db,
cfg,
block_env,
block.header.parent_beacon_block_root(),
block.parent_beacon_block_root(),
)
.map_err(|_| EthApiError::EvmCustom("failed to apply 4788 system call".to_string()))?;
system_caller
.pre_block_blockhashes_contract_call(db, cfg, block_env, block.header.parent_hash())
.pre_block_blockhashes_contract_call(db, cfg, block_env, block.parent_hash())
.map_err(|_| {
EthApiError::EvmCustom("failed to apply blockhashes system call".to_string())
})?;

10
crates/rpc/rpc/src/trace.rs
View File

@ -314,7 +314,7 @@ where
if let Some(base_block_reward) = self.calculate_base_block_reward(block.header())? {
all_traces.extend(
self.extract_reward_traces(
block.header.header(),
block.header(),
block.body().ommers(),
base_block_reward,
)
@ -391,11 +391,9 @@ where
maybe_traces.map(|traces| traces.into_iter().flatten().collect::<Vec<_>>());
if let (Some(block), Some(traces)) = (maybe_block, maybe_traces.as_mut()) {
if let Some(base_block_reward) =
self.calculate_base_block_reward(block.header.header())?
{
if let Some(base_block_reward) = self.calculate_base_block_reward(block.header())? {
traces.extend(self.extract_reward_traces(
block.block.header(),
block.header(),
block.body().ommers(),
base_block_reward,
));
@ -490,7 +488,7 @@ where
Ok(Some(BlockOpcodeGas {
block_hash: block.hash(),
block_number: block.header.number(),
block_number: block.number(),
transactions,
}))
}

15
crates/rpc/rpc/src/validation.rs
View File

@ -102,10 +102,10 @@ where
message: BidTrace,
registered_gas_limit: u64,
) -> Result<(), ValidationApiError> {
self.validate_message_against_header(&block.header, &message)?;
self.validate_message_against_header(block.sealed_header(), &message)?;
self.consensus.validate_header_with_total_difficulty(&block.header, U256::MAX)?;
self.consensus.validate_header(&block.header)?;
self.consensus.validate_header_with_total_difficulty(block.sealed_header(), U256::MAX)?;
self.consensus.validate_header(block.sealed_header())?;
self.consensus.validate_block_pre_execution(&block)?;
if !self.disallow.is_empty() {
@ -130,15 +130,14 @@ where
let latest_header =
self.provider.latest_header()?.ok_or_else(|| ValidationApiError::MissingLatestBlock)?;
if latest_header.hash() != block.header.parent_hash() {
if latest_header.hash() != block.parent_hash() {
return Err(ConsensusError::ParentHashMismatch(
GotExpected { got: block.header.parent_hash(), expected: latest_header.hash() }
.into(),
GotExpected { got: block.parent_hash(), expected: latest_header.hash() }.into(),
)
.into())
}
self.consensus.validate_header_against_parent(&block.header, &latest_header)?;
self.validate_gas_limit(registered_gas_limit, &latest_header, &block.header)?;
self.consensus.validate_header_against_parent(block.sealed_header(), &latest_header)?;
self.validate_gas_limit(registered_gas_limit, &latest_header, block.sealed_header())?;
let latest_header_hash = latest_header.hash();
let state_provider = self.provider.state_by_block_hash(latest_header_hash)?;