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: introduce ExecuteOutput (#11929)

Browse Source
This commit is contained in:
Federico Gimenez
2024-10-21 14:34:23 +02:00
committed by GitHub
parent f25cceb9f9
commit 7119bb1fe0
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ use reth_ethereum_consensus::validate_block_post_execution;
use reth_evm::{ use reth_evm::{
execute::{ execute::{
BasicBlockExecutorProvider, BlockExecutionError, BlockExecutionStrategy, BasicBlockExecutorProvider, BlockExecutionError, BlockExecutionStrategy,
BlockExecutionStrategyFactory, BlockValidationError, ProviderError, BlockExecutionStrategyFactory, BlockValidationError, ExecuteOutput, ProviderError,
}, },
state_change::post_block_balance_increments, state_change::post_block_balance_increments,
system_calls::{OnStateHook, SystemCaller}, system_calls::{OnStateHook, SystemCaller},
@ -152,7 +152,7 @@ where
&mut self, &mut self,
block: &BlockWithSenders, block: &BlockWithSenders,
total_difficulty: U256, total_difficulty: U256,
) -> Result<(Vec<Receipt>, u64), Self::Error> { ) -> Result<ExecuteOutput, Self::Error> {
let env = self.evm_env_for_block(&block.header, total_difficulty); let env = self.evm_env_for_block(&block.header, total_difficulty);
let mut evm = self.evm_config.evm_with_env(&mut self.state, env); let mut evm = self.evm_config.evm_with_env(&mut self.state, env);
@ -203,7 +203,7 @@ where
}, },
); );
} }
Ok((receipts, cumulative_gas_used)) Ok(ExecuteOutput { receipts, gas_used: cumulative_gas_used })
} }
fn apply_post_execution_changes( fn apply_post_execution_changes(

32
crates/evm/src/execute.rs
View File

@ -166,6 +166,15 @@ pub trait BlockExecutorProvider: Send + Sync + Clone + Unpin + 'static {
DB: Database<Error: Into<ProviderError> + Display>; DB: Database<Error: Into<ProviderError> + Display>;
} }
/// Helper type for the output of executing a block.
#[derive(Debug, Clone)]
pub struct ExecuteOutput {
/// Receipts obtained after executing a block.
pub receipts: Vec<Receipt>,
/// Cumulative gas used in the block execution.
pub gas_used: u64,
}
/// Defines the strategy for executing a single block. /// Defines the strategy for executing a single block.
pub trait BlockExecutionStrategy<DB> { pub trait BlockExecutionStrategy<DB> {
/// The error type returned by this strategy's methods. /// The error type returned by this strategy's methods.
@ -183,7 +192,7 @@ pub trait BlockExecutionStrategy<DB> {
&mut self, &mut self,
block: &BlockWithSenders, block: &BlockWithSenders,
total_difficulty: U256, total_difficulty: U256,
) -> Result<(Vec<Receipt>, u64), Self::Error>; ) -> Result<ExecuteOutput, Self::Error>;
/// Applies any necessary changes after executing the block's transactions. /// Applies any necessary changes after executing the block's transactions.
fn apply_post_execution_changes( fn apply_post_execution_changes(
@ -313,7 +322,8 @@ where
let BlockExecutionInput { block, total_difficulty } = input; let BlockExecutionInput { block, total_difficulty } = input;
self.strategy.apply_pre_execution_changes(block, total_difficulty)?; self.strategy.apply_pre_execution_changes(block, total_difficulty)?;
let (receipts, gas_used) = self.strategy.execute_transactions(block, total_difficulty)?; let ExecuteOutput { receipts, gas_used } =
self.strategy.execute_transactions(block, total_difficulty)?;
let requests = let requests =
self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?; self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?;
let state = self.strategy.finish(); let state = self.strategy.finish();
@ -332,7 +342,8 @@ where
let BlockExecutionInput { block, total_difficulty } = input; let BlockExecutionInput { block, total_difficulty } = input;
self.strategy.apply_pre_execution_changes(block, total_difficulty)?; self.strategy.apply_pre_execution_changes(block, total_difficulty)?;
let (receipts, gas_used) = self.strategy.execute_transactions(block, total_difficulty)?; let ExecuteOutput { receipts, gas_used } =
self.strategy.execute_transactions(block, total_difficulty)?;
let requests = let requests =
self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?; self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?;
@ -356,7 +367,8 @@ where
self.strategy.with_state_hook(Some(Box::new(state_hook))); self.strategy.with_state_hook(Some(Box::new(state_hook)));
self.strategy.apply_pre_execution_changes(block, total_difficulty)?; self.strategy.apply_pre_execution_changes(block, total_difficulty)?;
let (receipts, gas_used) = self.strategy.execute_transactions(block, total_difficulty)?; let ExecuteOutput { receipts, gas_used } =
self.strategy.execute_transactions(block, total_difficulty)?;
let requests = let requests =
self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?; self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?;
@ -407,7 +419,8 @@ where
} }
self.strategy.apply_pre_execution_changes(block, total_difficulty)?; self.strategy.apply_pre_execution_changes(block, total_difficulty)?;
let (receipts, _gas_used) = self.strategy.execute_transactions(block, total_difficulty)?; let ExecuteOutput { receipts, .. } =
self.strategy.execute_transactions(block, total_difficulty)?;
let requests = let requests =
self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?; self.strategy.apply_post_execution_changes(block, total_difficulty, &receipts)?;
@ -545,14 +558,14 @@ mod tests {
_chain_spec: Arc<ChainSpec>, _chain_spec: Arc<ChainSpec>,
_evm_config: EvmConfig, _evm_config: EvmConfig,
state: State<DB>, state: State<DB>,
execute_transactions_result: (Vec<Receipt>, u64), execute_transactions_result: ExecuteOutput,
apply_post_execution_changes_result: Requests, apply_post_execution_changes_result: Requests,
finish_result: BundleState, finish_result: BundleState,
} }
#[derive(Clone)] #[derive(Clone)]
struct TestExecutorStrategyFactory { struct TestExecutorStrategyFactory {
execute_transactions_result: (Vec<Receipt>, u64), execute_transactions_result: ExecuteOutput,
apply_post_execution_changes_result: Requests, apply_post_execution_changes_result: Requests,
finish_result: BundleState, finish_result: BundleState,
} }
@ -599,7 +612,7 @@ mod tests {
&mut self, &mut self,
_block: &BlockWithSenders, _block: &BlockWithSenders,
_total_difficulty: U256, _total_difficulty: U256,
) -> Result<(Vec<Receipt>, u64), Self::Error> { ) -> Result<ExecuteOutput, Self::Error> {
Ok(self.execute_transactions_result.clone()) Ok(self.execute_transactions_result.clone())
} }
@ -651,7 +664,8 @@ mod tests {
fn test_strategy() { fn test_strategy() {
let expected_gas_used = 10; let expected_gas_used = 10;
let expected_receipts = vec![Receipt::default()]; let expected_receipts = vec![Receipt::default()];
let expected_execute_transactions_result = (expected_receipts.clone(), expected_gas_used); let expected_execute_transactions_result =
ExecuteOutput { receipts: expected_receipts.clone(), gas_used: expected_gas_used };
let expected_apply_post_execution_changes_result = Requests::new(vec![bytes!("deadbeef")]); let expected_apply_post_execution_changes_result = Requests::new(vec![bytes!("deadbeef")]);
let expected_finish_result = BundleState::default(); let expected_finish_result = BundleState::default();

6
crates/optimism/evm/src/execute.rs
View File

@ -10,7 +10,7 @@ use reth_consensus::ConsensusError;
use reth_evm::{ use reth_evm::{
execute::{ execute::{
BasicBlockExecutorProvider, BlockExecutionError, BlockExecutionStrategy, BasicBlockExecutorProvider, BlockExecutionError, BlockExecutionStrategy,
BlockExecutionStrategyFactory, BlockValidationError, ProviderError, BlockExecutionStrategyFactory, BlockValidationError, ExecuteOutput, ProviderError,
}, },
state_change::post_block_balance_increments, state_change::post_block_balance_increments,
system_calls::{OnStateHook, SystemCaller}, system_calls::{OnStateHook, SystemCaller},
@ -155,7 +155,7 @@ where
&mut self, &mut self,
block: &BlockWithSenders, block: &BlockWithSenders,
total_difficulty: U256, total_difficulty: U256,
) -> Result<(Vec<Receipt>, u64), Self::Error> { ) -> Result<ExecuteOutput, Self::Error> {
let env = self.evm_env_for_block(&block.header, total_difficulty); let env = self.evm_env_for_block(&block.header, total_difficulty);
let mut evm = self.evm_config.evm_with_env(&mut self.state, env); let mut evm = self.evm_config.evm_with_env(&mut self.state, env);
@ -240,7 +240,7 @@ where
}); });
} }
Ok((receipts, cumulative_gas_used)) Ok(ExecuteOutput { receipts, gas_used: cumulative_gas_used })
} }
fn apply_post_execution_changes( fn apply_post_execution_changes(