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: misc eth strategy cleanup (#14315)

Browse Source
This commit is contained in:
Matthias Seitz
2025-02-07 23:42:19 +01:00
committed by GitHub
parent d374e7366c
commit 905fd37bde
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ethereum/evm/src/execute.rs
View File

@ -122,8 +122,7 @@ where
block: &RecoveredBlock<reth_primitives::Block>, block: &RecoveredBlock<reth_primitives::Block>,
) -> Result<(), Self::Error> { ) -> Result<(), Self::Error> {
// Set state clear flag if the block is after the Spurious Dragon hardfork. // Set state clear flag if the block is after the Spurious Dragon hardfork.
let state_clear_flag = let state_clear_flag = self.chain_spec.is_spurious_dragon_active_at_block(block.number());
(*self.chain_spec).is_spurious_dragon_active_at_block(block.number());
self.state.set_state_clear_flag(state_clear_flag); self.state.set_state_clear_flag(state_clear_flag);
let mut evm = self.evm_config.evm_for_block(&mut self.state, block.header()); let mut evm = self.evm_config.evm_for_block(&mut self.state, block.header());
@ -142,8 +141,8 @@ where
let mut cumulative_gas_used = 0; let mut cumulative_gas_used = 0;
let mut receipts = Vec::with_capacity(block.body().transaction_count()); let mut receipts = Vec::with_capacity(block.body().transaction_count());
for (sender, transaction) in block.transactions_with_sender() { for (sender, transaction) in block.transactions_with_sender() {
// The sum of the transaction’s gas limit, Tg, and the gas utilized in this block prior, // The sum of the transaction's gas limit, Tg, and the gas utilized in this block prior,
// must be no greater than the block’s gasLimit. // must be no greater than the block's gasLimit.
let block_available_gas = block.gas_limit() - cumulative_gas_used; let block_available_gas = block.gas_limit() - cumulative_gas_used;
if transaction.gas_limit() > block_available_gas { if transaction.gas_limit() > block_available_gas {
return Err(BlockValidationError::TransactionGasLimitMoreThanAvailableBlockGas { return Err(BlockValidationError::TransactionGasLimitMoreThanAvailableBlockGas {
@ -171,19 +170,14 @@ where
cumulative_gas_used += result.gas_used(); cumulative_gas_used += result.gas_used();
// Push transaction changeset and calculate header bloom filter for receipt. // Push transaction changeset and calculate header bloom filter for receipt.
receipts.push( receipts.push(Receipt {
#[allow(clippy::needless_update)] // side-effect of optimism fields
Receipt {
tx_type: transaction.tx_type(), tx_type: transaction.tx_type(),
// Success flag was added in `EIP-658: Embedding transaction status code in // Success flag was added in `EIP-658: Embedding transaction status code in
// receipts`. // receipts`.
success: result.is_success(), success: result.is_success(),
cumulative_gas_used, cumulative_gas_used,
// convert to reth log
logs: result.into_logs(), logs: result.into_logs(),
..Default::default() });
},
);
} }
Ok(ExecuteOutput { receipts, gas_used: cumulative_gas_used }) Ok(ExecuteOutput { receipts, gas_used: cumulative_gas_used })
} }