wip:feat: add SystemCaller helper type

crates/evm/src/system_calls/eip7002.rs

@@ -118,6 +118,11 @@ where
     // commit the state
     evm.context.evm.db.commit(state);
 
+    post_commit(result)
+}
+
+#[inline]
+pub(crate) fn post_commit(result: ExecutionResult) -> Result<Vec<Request>, BlockExecutionError> {
     let mut data = match result {
         ExecutionResult::Success { output, .. } => Ok(output.into_data()),
         ExecutionResult::Revert { output, .. } => {

crates/evm/src/system_calls/eip7251.rs

@@ -120,6 +120,11 @@ where
     // commit the state
     evm.context.evm.db.commit(state);
 
+    post_commit(result)
+}
+
+#[inline]
+pub(crate) fn post_commit(result: ExecutionResult) -> Result<Vec<Request>, BlockExecutionError> {
     let mut data = match result {
         ExecutionResult::Success { output, .. } => Ok(output.into_data()),
         ExecutionResult::Revert { output, .. } => {

crates/evm/src/system_calls/mod.rs

@@ -1,5 +1,14 @@
 //! System contract call functions.
 
+use crate::ConfigureEvm;
+use alloc::{sync::Arc, vec::Vec};
+use core::fmt::Display;
+use reth_chainspec::EthereumHardforks;
+use reth_execution_errors::BlockExecutionError;
+use reth_primitives::{Block, Header, Request};
+use revm::{Database, DatabaseCommit, Evm};
+use revm_primitives::{BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ResultAndState, B256};
+
 mod eip2935;
 pub use eip2935::*;
 
@@ -11,3 +20,314 @@ pub use eip7002::*;
 
 mod eip7251;
 pub use eip7251::*;
+
+/// A hook that is called after each state change.
+// TODO impl for &mut
+pub trait OnStateHook {
+    /// Invoked with the result and state after each system call.
+    fn on_state(&mut self, state: &ResultAndState);
+}
+
+impl<F> OnStateHook for F
+where
+    F: FnMut(&ResultAndState),
+{
+    fn on_state(&mut self, state: &ResultAndState) {
+        self(state)
+    }
+}
+
+/// An [`OnStateHook`] that does nothing.
+#[derive(Default, Debug, Clone)]
+#[non_exhaustive]
+pub struct NoopHook;
+
+impl OnStateHook for NoopHook {
+    fn on_state(&mut self, _state: &ResultAndState) {}
+}
+
+/// An ephemeral helper type for executing system calls.
+///
+/// This can be used to chain system transaction calls.
+#[allow(missing_debug_implementations)]
+pub struct SystemCaller<'a, EvmConfig, Chainspec, Hook = NoopHook> {
+    evm_config: &'a EvmConfig,
+    chain_spec: Arc<Chainspec>,
+    /// Optional hook to be called after each state change.
+    // TODO do we want this optional?
+    hook: Option<Hook>,
+}
+
+impl<'a, EvmConfig, Chainspec> SystemCaller<'a, EvmConfig, Chainspec> {
+    /// Create a new system caller with the given EVM config, database, and chain spec, and creates
+    /// the EVM with the given initialized config and block environment.
+    pub const fn new(evm_config: &'a EvmConfig, chain_spec: Arc<Chainspec>) -> Self {
+        Self { evm_config, chain_spec, hook: None }
+    }
+}
+
+impl<'a, EvmConfig, Chainspec, Hook> SystemCaller<'a, EvmConfig, Chainspec, Hook> {
+    /// Installs a custom hook to be called after each state change.
+    pub fn with_state_hook<H: OnStateHook>(
+        self,
+        hook: H,
+    ) -> SystemCaller<'a, EvmConfig, Chainspec, H> {
+        let Self { evm_config, chain_spec, .. } = self;
+        SystemCaller { evm_config, chain_spec, hook: Some(hook) }
+    }
+    /// Convenience method to consume the type and drop borrowed fields
+    pub fn finish(self) {}
+}
+
+fn initialize_evm<'a, DB>(
+    db: &'a mut DB,
+    initialized_cfg: &'a CfgEnvWithHandlerCfg,
+    initialized_block_env: &'a BlockEnv,
+) -> Evm<'a, (), &'a mut DB>
+where
+    DB: Database,
+{
+    Evm::builder()
+        .with_db(db)
+        .with_env_with_handler_cfg(EnvWithHandlerCfg::new_with_cfg_env(
+            initialized_cfg.clone(),
+            initialized_block_env.clone(),
+            Default::default(),
+        ))
+        .build()
+}
+
+impl<'a, EvmConfig, Chainspec, Hook> SystemCaller<'a, EvmConfig, Chainspec, Hook>
+where
+    EvmConfig: ConfigureEvm<Header = Header>,
+    Chainspec: EthereumHardforks,
+    Hook: OnStateHook,
+{
+    /// Apply pre execution changes.
+    pub fn apply_pre_execution_changes<DB, Ext>(
+        &mut self,
+        block: &Block,
+        evm: &mut Evm<'_, Ext, DB>,
+    ) -> Result<(), BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        self.apply_blockhashes_contract_call(
+            block.timestamp,
+            block.number,
+            block.parent_hash,
+            evm,
+        )?;
+        self.apply_beacon_root_contract_call(
+            block.timestamp,
+            block.number,
+            block.parent_beacon_block_root,
+            evm,
+        )?;
+
+        Ok(())
+    }
+
+    /// Apply post execution changes.
+    pub fn apply_post_execution_changes<DB, Ext>(
+        &mut self,
+        evm: &mut Evm<'_, Ext, DB>,
+    ) -> Result<Vec<Request>, BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        // Collect all EIP-7685 requests
+        let withdrawal_requests = self.apply_withdrawal_requests_contract_call(evm)?;
+
+        // Collect all EIP-7251 requests
+        let consolidation_requests = self.apply_consolidation_requests_contract_call(evm)?;
+        Ok([withdrawal_requests, consolidation_requests].concat())
+    }
+
+    /// Applies the pre-block call to the EIP-2935 blockhashes contract.
+    pub fn pre_block_blockhashes_contract_call<DB>(
+        &mut self,
+        db: &mut DB,
+        initialized_cfg: &CfgEnvWithHandlerCfg,
+        initialized_block_env: &BlockEnv,
+        parent_block_hash: B256,
+    ) -> Result<(), BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let mut evm = initialize_evm(db, initialized_cfg, initialized_block_env);
+        self.apply_blockhashes_contract_call(
+            initialized_block_env.timestamp.to(),
+            initialized_block_env.number.to(),
+            parent_block_hash,
+            &mut evm,
+        )?;
+
+        Ok(())
+    }
+
+    /// Applies the pre-block call to the EIP-2935 blockhashes contract.
+    pub fn apply_blockhashes_contract_call<DB, Ext>(
+        &mut self,
+        timestamp: u64,
+        block_number: u64,
+        parent_block_hash: B256,
+        evm: &mut Evm<'_, Ext, DB>,
+    ) -> Result<(), BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let result_and_state = eip2935::transact_blockhashes_contract_call(
+            &self.evm_config.clone(),
+            self.chain_spec.as_ref(),
+            timestamp,
+            block_number,
+            parent_block_hash,
+            evm,
+        )?;
+
+        if let Some(res) = result_and_state {
+            if let Some(ref mut hook) = self.hook {
+                hook.on_state(&res);
+            }
+            evm.context.evm.db.commit(res.state);
+        }
+
+        Ok(())
+    }
+
+    /// Applies the pre-block call to the EIP-4788 beacon root contract.
+    pub fn pre_block_beacon_root_contract_call<DB>(
+        &mut self,
+        db: &mut DB,
+        initialized_cfg: &CfgEnvWithHandlerCfg,
+        initialized_block_env: &BlockEnv,
+        parent_beacon_block_root: Option<B256>,
+    ) -> Result<(), BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let mut evm = initialize_evm(db, initialized_cfg, initialized_block_env);
+
+        self.apply_beacon_root_contract_call(
+            initialized_block_env.timestamp.to(),
+            initialized_block_env.number.to(),
+            parent_beacon_block_root,
+            &mut evm,
+        )?;
+
+        Ok(())
+    }
+
+    /// Applies the pre-block call to the EIP-4788 beacon root contract.
+    pub fn apply_beacon_root_contract_call<DB, Ext>(
+        &mut self,
+        timestamp: u64,
+        block_number: u64,
+        parent_block_hash: Option<B256>,
+        evm: &mut Evm<'_, Ext, DB>,
+    ) -> Result<(), BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let result_and_state = eip4788::transact_beacon_root_contract_call(
+            &self.evm_config.clone(),
+            self.chain_spec.as_ref(),
+            timestamp,
+            block_number,
+            parent_block_hash,
+            evm,
+        )?;
+
+        if let Some(res) = result_and_state {
+            if let Some(ref mut hook) = self.hook {
+                hook.on_state(&res);
+            }
+            evm.context.evm.db.commit(res.state);
+        }
+
+        Ok(())
+    }
+
+    /// Applies the post-block call to the EIP-7002 withdrawal request contract.
+    pub fn post_block_withdrawal_requests_contract_call<DB>(
+        &mut self,
+        db: &mut DB,
+        initialized_cfg: &CfgEnvWithHandlerCfg,
+        initialized_block_env: &BlockEnv,
+    ) -> Result<Vec<Request>, BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let mut evm = initialize_evm(db, initialized_cfg, initialized_block_env);
+
+        let result = self.apply_withdrawal_requests_contract_call(&mut evm)?;
+
+        Ok(result)
+    }
+
+    /// Applies the post-block call to the EIP-7002 withdrawal request contract.
+    pub fn apply_withdrawal_requests_contract_call<DB, Ext>(
+        &mut self,
+        evm: &mut Evm<'_, Ext, DB>,
+    ) -> Result<Vec<Request>, BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let result_and_state =
+            eip7002::transact_withdrawal_requests_contract_call(&self.evm_config.clone(), evm)?;
+
+        if let Some(ref mut hook) = self.hook {
+            hook.on_state(&result_and_state);
+        }
+        evm.context.evm.db.commit(result_and_state.state);
+
+        eip7002::post_commit(result_and_state.result)
+    }
+
+    /// Applies the post-block call to the EIP-7251 consolidation requests contract.
+    pub fn post_block_consolidation_requests_contract_call<DB>(
+        &mut self,
+        db: &mut DB,
+        initialized_cfg: &CfgEnvWithHandlerCfg,
+        initialized_block_env: &BlockEnv,
+    ) -> Result<Vec<Request>, BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let mut evm = initialize_evm(db, initialized_cfg, initialized_block_env);
+
+        let res = self.apply_consolidation_requests_contract_call(&mut evm)?;
+
+        Ok(res)
+    }
+
+    /// Applies the post-block call to the EIP-7251 consolidation requests contract.
+    pub fn apply_consolidation_requests_contract_call<DB, Ext>(
+        &mut self,
+        evm: &mut Evm<'_, Ext, DB>,
+    ) -> Result<Vec<Request>, BlockExecutionError>
+    where
+        DB: Database + DatabaseCommit,
+        DB::Error: Display,
+    {
+        let result_and_state =
+            eip7251::transact_consolidation_requests_contract_call(&self.evm_config.clone(), evm)?;
+
+        if let Some(ref mut hook) = self.hook {
+            hook.on_state(&result_and_state);
+        }
+        evm.context.evm.db.commit(result_and_state.state);
+
+        eip7251::post_commit(result_and_state.result)
+    }
+}