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

chore: get rid of compat call (#7930)

Browse Source
This commit is contained in:
Matthias Seitz
2024-04-27 07:55:06 +02:00
committed by GitHub
parent cc4a418ddf
commit 43f58f16dd
2 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/payload/validator/src/lib.rs
View File

@ -10,7 +10,7 @@
use reth_primitives::{ChainSpec, SealedBlock}; use reth_primitives::{ChainSpec, SealedBlock};
use reth_rpc_types::{engine::MaybeCancunPayloadFields, ExecutionPayload, PayloadError}; use reth_rpc_types::{engine::MaybeCancunPayloadFields, ExecutionPayload, PayloadError};
use reth_rpc_types_compat::engine::payload::{try_into_block, validate_block_hash}; use reth_rpc_types_compat::engine::payload::try_into_block;
use std::sync::Arc; use std::sync::Arc;
/// Execution payload validator. /// Execution payload validator.
@ -100,21 +100,27 @@ impl ExecutionPayloadValidator {
payload: ExecutionPayload, payload: ExecutionPayload,
cancun_fields: MaybeCancunPayloadFields, cancun_fields: MaybeCancunPayloadFields,
) -> Result<SealedBlock, PayloadError> { ) -> Result<SealedBlock, PayloadError> {
let block_hash = payload.block_hash(); let expected_hash = payload.block_hash();
// First parse the block // First parse the block
let block = try_into_block(payload, cancun_fields.parent_beacon_block_root())?; let sealed_block =
try_into_block(payload, cancun_fields.parent_beacon_block_root())?.seal_slow();
let cancun_active = self.is_cancun_active_at_timestamp(block.timestamp); // Ensure the hash included in the payload matches the block hash
if expected_hash != sealed_block.hash() {
return Err(PayloadError::BlockHash {
execution: sealed_block.hash(),
consensus: expected_hash,
})
}
if !cancun_active && block.has_blob_transactions() { let cancun_active = self.is_cancun_active_at_timestamp(sealed_block.timestamp);
if !cancun_active && sealed_block.has_blob_transactions() {
// cancun not active but blob transactions present // cancun not active but blob transactions present
return Err(PayloadError::PreCancunBlockWithBlobTransactions) return Err(PayloadError::PreCancunBlockWithBlobTransactions)
} }
// Ensure the hash included in the payload matches the block hash
let sealed_block = validate_block_hash(block_hash, block)?;
// EIP-4844 checks // EIP-4844 checks
self.ensure_matching_blob_versioned_hashes(&sealed_block, &cancun_fields)?; self.ensure_matching_blob_versioned_hashes(&sealed_block, &cancun_fields)?;

126
crates/primitives/src/block.rs
View File

@ -296,66 +296,6 @@ pub struct SealedBlock {
pub withdrawals: Option<Withdrawals>, pub withdrawals: Option<Withdrawals>,
} }
/// Generates a header which is valid __with respect to past and future forks__. This means, for
/// example, that if the withdrawals root is present, the base fee per gas is also present.
///
/// If blob gas used were present, then the excess blob gas and parent beacon block root are also
/// present. In this example, the withdrawals root would also be present.
///
/// This __does not, and should not guarantee__ that the header is valid with respect to __anything
/// else__.
#[cfg(any(test, feature = "arbitrary"))]
pub fn generate_valid_header(
mut header: Header,
eip_4844_active: bool,
blob_gas_used: u64,
excess_blob_gas: u64,
parent_beacon_block_root: B256,
) -> Header {
// EIP-1559 logic
if header.base_fee_per_gas.is_none() {
// If EIP-1559 is not active, clear related fields
header.withdrawals_root = None;
header.blob_gas_used = None;
header.excess_blob_gas = None;
header.parent_beacon_block_root = None;
} else if header.withdrawals_root.is_none() {
// If EIP-4895 is not active, clear related fields
header.blob_gas_used = None;
header.excess_blob_gas = None;
header.parent_beacon_block_root = None;
} else if eip_4844_active {
// Set fields based on EIP-4844 being active
header.blob_gas_used = Some(blob_gas_used);
header.excess_blob_gas = Some(excess_blob_gas);
header.parent_beacon_block_root = Some(parent_beacon_block_root);
} else {
// If EIP-4844 is not active, clear related fields
header.blob_gas_used = None;
header.excess_blob_gas = None;
header.parent_beacon_block_root = None;
}
header
}
#[cfg(any(test, feature = "arbitrary"))]
prop_compose! {
/// Generates a proptest strategy for constructing an instance of a header which is valid __with
/// respect to past and future forks__.
///
/// See docs for [generate_valid_header] for more information.
pub fn valid_header_strategy()(
header in any::<Header>(),
eip_4844_active in any::<bool>(),
blob_gas_used in any::<u64>(),
excess_blob_gas in any::<u64>(),
parent_beacon_block_root in any::<B256>()
) -> Header {
generate_valid_header(header, eip_4844_active, blob_gas_used, excess_blob_gas, parent_beacon_block_root)
}
}
impl SealedBlock { impl SealedBlock {
/// Create a new sealed block instance using the sealed header and block body. /// Create a new sealed block instance using the sealed header and block body.
#[inline] #[inline]
@ -458,6 +398,12 @@ impl SealedBlock {
self.blob_transactions().iter().filter_map(|tx| tx.blob_gas_used()).sum() self.blob_transactions().iter().filter_map(|tx| tx.blob_gas_used()).sum()
} }
/// Returns whether or not the block contains any blob transactions.
#[inline]
pub fn has_blob_transactions(&self) -> bool {
self.body.iter().any(|tx| tx.is_eip4844())
}
/// Ensures that the transaction root in the block header is valid. /// Ensures that the transaction root in the block header is valid.
/// ///
/// The transaction root is the Keccak 256-bit hash of the root node of the trie structure /// The transaction root is the Keccak 256-bit hash of the root node of the trie structure
@ -653,6 +599,66 @@ impl From<Block> for BlockBody {
} }
} }
/// Generates a header which is valid __with respect to past and future forks__. This means, for
/// example, that if the withdrawals root is present, the base fee per gas is also present.
///
/// If blob gas used were present, then the excess blob gas and parent beacon block root are also
/// present. In this example, the withdrawals root would also be present.
///
/// This __does not, and should not guarantee__ that the header is valid with respect to __anything
/// else__.
#[cfg(any(test, feature = "arbitrary"))]
pub fn generate_valid_header(
mut header: Header,
eip_4844_active: bool,
blob_gas_used: u64,
excess_blob_gas: u64,
parent_beacon_block_root: B256,
) -> Header {
// EIP-1559 logic
if header.base_fee_per_gas.is_none() {
// If EIP-1559 is not active, clear related fields
header.withdrawals_root = None;
header.blob_gas_used = None;
header.excess_blob_gas = None;
header.parent_beacon_block_root = None;
} else if header.withdrawals_root.is_none() {
// If EIP-4895 is not active, clear related fields
header.blob_gas_used = None;
header.excess_blob_gas = None;
header.parent_beacon_block_root = None;
} else if eip_4844_active {
// Set fields based on EIP-4844 being active
header.blob_gas_used = Some(blob_gas_used);
header.excess_blob_gas = Some(excess_blob_gas);
header.parent_beacon_block_root = Some(parent_beacon_block_root);
} else {
// If EIP-4844 is not active, clear related fields
header.blob_gas_used = None;
header.excess_blob_gas = None;
header.parent_beacon_block_root = None;
}
header
}
#[cfg(any(test, feature = "arbitrary"))]
prop_compose! {
/// Generates a proptest strategy for constructing an instance of a header which is valid __with
/// respect to past and future forks__.
///
/// See docs for [generate_valid_header] for more information.
pub fn valid_header_strategy()(
header in any::<Header>(),
eip_4844_active in any::<bool>(),
blob_gas_used in any::<u64>(),
excess_blob_gas in any::<u64>(),
parent_beacon_block_root in any::<B256>()
) -> Header {
generate_valid_header(header, eip_4844_active, blob_gas_used, excess_blob_gas, parent_beacon_block_root)
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{BlockNumberOrTag::*, *}; use super::{BlockNumberOrTag::*, *};