diff --git a/crates/chain-state/src/in_memory.rs b/crates/chain-state/src/in_memory.rs index 6133bc6a4..06d228a8f 100644 --- a/crates/chain-state/src/in_memory.rs +++ b/crates/chain-state/src/in_memory.rs @@ -18,7 +18,7 @@ use reth_primitives::{ use reth_primitives_traits::{Block, BlockBody as _, SignedTransaction}; use reth_storage_api::StateProviderBox; use reth_trie::{updates::TrieUpdates, HashedPostState}; -use std::{collections::BTreeMap, sync::Arc, time::Instant}; +use std::{collections::BTreeMap, ops::Deref, sync::Arc, time::Instant}; use tokio::sync::{broadcast, watch}; /// Size of the broadcast channel used to notify canonical state events. @@ -183,7 +183,7 @@ impl CanonicalInMemoryState { let in_memory_state = InMemoryState::new(blocks, numbers, pending); let header = in_memory_state .head_state() - .map_or_else(SealedHeader::default, |state| state.block_ref().block().header.clone()); + .map_or_else(SealedHeader::default, |state| state.block_ref().block().deref().clone()); let chain_info_tracker = ChainInfoTracker::new(header, finalized, safe); let (canon_state_notification_sender, _) = broadcast::channel(CANON_STATE_NOTIFICATION_CHANNEL_SIZE); @@ -462,7 +462,7 @@ impl CanonicalInMemoryState { /// Returns the `SealedHeader` corresponding to the pending state. pub fn pending_sealed_header(&self) -> Option> { - self.pending_state().map(|h| h.block_ref().block().header.clone()) + self.pending_state().map(|h| h.block_ref().block().deref().clone()) } /// Returns the `Header` corresponding to the pending state. @@ -584,7 +584,7 @@ impl CanonicalInMemoryState { index: index as u64, block_hash: block_state.hash(), block_number: block_state.block_ref().block.number(), - base_fee: block_state.block_ref().block.header.base_fee_per_gas(), + base_fee: block_state.block_ref().block.base_fee_per_gas(), timestamp: block_state.block_ref().block.timestamp(), excess_blob_gas: block_state.block_ref().block.excess_blob_gas(), }; @@ -664,7 +664,7 @@ impl BlockState { /// Returns the state root after applying the executed block that determines /// the state. pub fn state_root(&self) -> B256 { - self.block.block().header.state_root() + self.block.block().state_root() } /// Returns the `Receipts` of executed block that determines the state. @@ -789,7 +789,7 @@ impl BlockState { index: index as u64, block_hash: block_state.hash(), block_number: block_state.block_ref().block.number(), - base_fee: block_state.block_ref().block.header.base_fee_per_gas(), + base_fee: block_state.block_ref().block.base_fee_per_gas(), timestamp: block_state.block_ref().block.timestamp(), excess_blob_gas: block_state.block_ref().block.excess_blob_gas(), }; @@ -1318,7 +1318,7 @@ mod tests { ); // Check the pending header - assert_eq!(state.pending_header().unwrap(), block2.block().header.header().clone()); + assert_eq!(state.pending_header().unwrap(), block2.block().header().clone()); // Check the pending sealed header assert_eq!(state.pending_sealed_header().unwrap(), block2.block().header.clone()); diff --git a/crates/consensus/common/src/validation.rs b/crates/consensus/common/src/validation.rs index d1131baee..8754fe818 100644 --- a/crates/consensus/common/src/validation.rs +++ b/crates/consensus/common/src/validation.rs @@ -140,11 +140,11 @@ where { // Check ommers hash let ommers_hash = block.body().calculate_ommers_root(); - if Some(block.header.ommers_hash()) != ommers_hash { + if Some(block.ommers_hash()) != ommers_hash { return Err(ConsensusError::BodyOmmersHashDiff( GotExpected { got: ommers_hash.unwrap_or(EMPTY_OMMER_ROOT_HASH), - expected: block.header.ommers_hash(), + expected: block.ommers_hash(), } .into(), )) diff --git a/crates/evm/execution-types/src/chain.rs b/crates/evm/execution-types/src/chain.rs index aef0ced68..e207209a9 100644 --- a/crates/evm/execution-types/src/chain.rs +++ b/crates/evm/execution-types/src/chain.rs @@ -710,10 +710,10 @@ mod tests { let mut block3 = block.clone(); let mut block4 = block; - block1.block.header.set_hash(block1_hash); - block2.block.header.set_hash(block2_hash); - block3.block.header.set_hash(block3_hash); - block4.block.header.set_hash(block4_hash); + block1.block.set_hash(block1_hash); + block2.block.set_hash(block2_hash); + block3.block.set_hash(block3_hash); + block4.block.set_hash(block4_hash); block3.set_parent_hash(block2_hash); diff --git a/crates/net/p2p/src/full_block.rs b/crates/net/p2p/src/full_block.rs index a966c01c9..62981ad5d 100644 --- a/crates/net/p2p/src/full_block.rs +++ b/crates/net/p2p/src/full_block.rs @@ -709,7 +709,7 @@ mod tests { assert_eq!(received.len(), 10); for (i, block) in received.iter().enumerate() { let expected_number = header.number - i as u64; - assert_eq!(block.header.number, expected_number); + assert_eq!(block.number, expected_number); } } @@ -728,7 +728,7 @@ mod tests { assert_eq!(received.len(), 50); for (i, block) in received.iter().enumerate() { let expected_number = header.number - i as u64; - assert_eq!(block.header.number, expected_number); + assert_eq!(block.number, expected_number); } } @@ -748,7 +748,7 @@ mod tests { assert_eq!(received.len(), range_length); for (i, block) in received.iter().enumerate() { let expected_number = header.number - i as u64; - assert_eq!(block.header.number, expected_number); + assert_eq!(block.number, expected_number); } } } diff --git a/crates/optimism/consensus/src/lib.rs b/crates/optimism/consensus/src/lib.rs index 4d2536667..01f8f9a72 100644 --- a/crates/optimism/consensus/src/lib.rs +++ b/crates/optimism/consensus/src/lib.rs @@ -75,9 +75,9 @@ impl Consensus for OpBeaconConsensus { ) -> Result<(), ConsensusError> { // Check ommers hash let ommers_hash = block.body().calculate_ommers_root(); - if block.header.ommers_hash != ommers_hash { + if block.ommers_hash != ommers_hash { return Err(ConsensusError::BodyOmmersHashDiff( - GotExpected { got: ommers_hash, expected: block.header.ommers_hash }.into(), + GotExpected { got: ommers_hash, expected: block.ommers_hash }.into(), )) } diff --git a/crates/optimism/evm/src/lib.rs b/crates/optimism/evm/src/lib.rs index ec2a56389..9fc7ee528 100644 --- a/crates/optimism/evm/src/lib.rs +++ b/crates/optimism/evm/src/lib.rs @@ -543,11 +543,11 @@ mod tests { let mut block2 = block; // Set the hashes of block1 and block2 - block1.block.header.set_block_number(10); - block1.block.header.set_hash(block1_hash); + block1.block.set_block_number(10); + block1.block.set_hash(block1_hash); - block2.block.header.set_block_number(11); - block2.block.header.set_hash(block2_hash); + block2.block.set_block_number(11); + block2.block.set_hash(block2_hash); // Create a random receipt object, receipt1 let receipt1 = OpReceipt::Legacy(Receipt { diff --git a/crates/payload/validator/src/lib.rs b/crates/payload/validator/src/lib.rs index 6a75463c6..e696e557a 100644 --- a/crates/payload/validator/src/lib.rs +++ b/crates/payload/validator/src/lib.rs @@ -131,11 +131,11 @@ impl ExecutionPayloadValidator { } if self.is_cancun_active_at_timestamp(sealed_block.timestamp) { - if sealed_block.header.blob_gas_used.is_none() { + if sealed_block.blob_gas_used.is_none() { // cancun active but blob gas used not present return Err(PayloadError::PostCancunBlockWithoutBlobGasUsed) } - if sealed_block.header.excess_blob_gas.is_none() { + if sealed_block.excess_blob_gas.is_none() { // cancun active but excess blob gas not present return Err(PayloadError::PostCancunBlockWithoutExcessBlobGas) } @@ -148,11 +148,11 @@ impl ExecutionPayloadValidator { // cancun not active but blob transactions present return Err(PayloadError::PreCancunBlockWithBlobTransactions) } - if sealed_block.header.blob_gas_used.is_some() { + if sealed_block.blob_gas_used.is_some() { // cancun not active but blob gas used present return Err(PayloadError::PreCancunBlockWithBlobGasUsed) } - if sealed_block.header.excess_blob_gas.is_some() { + if sealed_block.excess_blob_gas.is_some() { // cancun not active but excess blob gas present return Err(PayloadError::PreCancunBlockWithExcessBlobGas) } diff --git a/crates/rpc/rpc-types-compat/src/engine/payload.rs b/crates/rpc/rpc-types-compat/src/engine/payload.rs index 2ce20865b..e4f49fe7d 100644 --- a/crates/rpc/rpc-types-compat/src/engine/payload.rs +++ b/crates/rpc/rpc-types-compat/src/engine/payload.rs @@ -32,7 +32,7 @@ pub fn block_to_payload( _ => ExecutionPayloadSidecar::none(), }; - let execution_payload = if value.header.parent_beacon_block_root.is_some() { + let execution_payload = if value.parent_beacon_block_root.is_some() { // block with parent beacon block root: V3 ExecutionPayload::V3(block_to_payload_v3(value)) } else if value.body().withdrawals.is_some() { diff --git a/testing/testing-utils/src/generators.rs b/testing/testing-utils/src/generators.rs index 529c0a49f..e5dc7fc06 100644 --- a/testing/testing-utils/src/generators.rs +++ b/testing/testing-utils/src/generators.rs @@ -263,7 +263,7 @@ pub fn random_block_range( idx, BlockParams { parent: Some( - blocks.last().map(|block: &SealedBlock| block.header.hash()).unwrap_or(parent), + blocks.last().map(|block: &SealedBlock| block.hash()).unwrap_or(parent), ), tx_count: Some(tx_count), ommers_count: None,