touchups

crates/engine/util/src/reorg.rs

@@ -259,8 +259,6 @@ where
     Evm: ConfigureEvm<Header = Header>,
     Spec: EthereumHardforks,
 {
-    let chain_spec = Arc::new(payload_validator.chain_spec());
-
     // Ensure next payload is valid.
     let next_block = payload_validator
         .ensure_well_formed_payload(next_payload, next_sidecar)
@@ -304,7 +302,8 @@ where
     let mut evm = evm_config.evm_with_env(&mut state, env);
 
     // apply eip-4788 pre block contract call
-    let mut system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
+    let mut system_caller =
+        SystemCaller::new(evm_config.clone(), payload_validator.chain_spec().clone());
 
     system_caller.apply_beacon_root_contract_call(
         reorg_target.timestamp,

crates/evm/src/system_calls/mod.rs

@@ -1,7 +1,7 @@
 //! System contract call functions.
 
 use crate::ConfigureEvm;
-use alloc::{boxed::Box, vec};
+use alloc::{boxed::Box, sync::Arc, vec};
 use alloy_eips::eip7685::Requests;
 use alloy_primitives::Bytes;
 use core::fmt::Display;
@@ -10,7 +10,6 @@ use reth_execution_errors::BlockExecutionError;
 use reth_primitives::{Block, Header};
 use revm::{Database, DatabaseCommit, Evm};
 use revm_primitives::{BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ResultAndState, B256};
-use std::sync::Arc;
 
 mod eip2935;
 mod eip4788;

crates/payload/validator/src/lib.rs

@@ -31,7 +31,7 @@ impl<ChainSpec> ExecutionPayloadValidator<ChainSpec> {
 
     /// Returns the chain spec used by the validator.
     #[inline]
-    pub fn chain_spec(&self) -> &ChainSpec {
+    pub fn chain_spec(&self) -> &Arc<ChainSpec> {
         &self.chain_spec
     }
 }