From 1fc5063d5a030ce7c50d4a8d91dc43d9dd5d09d0 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sat, 2 Nov 2024 08:22:12 +0100
Subject: [PATCH] touchups

---
 crates/engine/util/src/reorg.rs     | 5 ++---
 crates/evm/src/system_calls/mod.rs  | 3 +--
 crates/payload/validator/src/lib.rs | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/crates/engine/util/src/reorg.rs b/crates/engine/util/src/reorg.rs
index ed5cf9688ec6..69831389a658 100644
--- a/crates/engine/util/src/reorg.rs
+++ b/crates/engine/util/src/reorg.rs
@@ -32,7 +32,6 @@ use std::{
     collections::VecDeque,
     future::Future,
     pin::Pin,
-    sync::Arc,
     task::{ready, Context, Poll},
 };
 use tokio::sync::oneshot;
@@ -259,7 +258,7 @@ where
     Evm: ConfigureEvm<Header = Header>,
     Spec: EthereumHardforks,
 {
-    let chain_spec = Arc::new(payload_validator.chain_spec());
+    let chain_spec = payload_validator.chain_spec();
 
     // Ensure next payload is valid.
     let next_block = payload_validator
@@ -366,7 +365,7 @@ where
 
     if let Some(withdrawals) = &reorg_target.body.withdrawals {
         state.increment_balances(post_block_withdrawals_balance_increments(
-            &chain_spec,
+            chain_spec,
             reorg_target.timestamp,
             withdrawals,
         ))?;
diff --git a/crates/evm/src/system_calls/mod.rs b/crates/evm/src/system_calls/mod.rs
index f1c5627d623c..7fdb31d967dd 100644
--- a/crates/evm/src/system_calls/mod.rs
+++ b/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;
diff --git a/crates/payload/validator/src/lib.rs b/crates/payload/validator/src/lib.rs
index 38e53bac42a5..e74b5f48d40f 100644
--- a/crates/payload/validator/src/lib.rs
+++ b/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 const fn chain_spec(&self) -> &Arc<ChainSpec> {
         &self.chain_spec
     }
 }