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

Use Arc<ChainSpec> in SystemCaller (#12268)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Steven
2024-11-02 01:41:11 -06:00
committed by GitHub
parent d7ead13bda
commit 962fa6685b
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/engine/util/src/reorg.rs
View File

@ -303,7 +303,7 @@ 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);
let mut system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
system_caller.apply_beacon_root_contract_call(
reorg_target.timestamp,

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

@ -95,7 +95,7 @@ where
{
/// Creates a new [`EthExecutionStrategy`]
pub fn new(state: State<DB>, chain_spec: Arc<ChainSpec>, evm_config: EvmConfig) -> Self {
let system_caller = SystemCaller::new(evm_config.clone(), (*chain_spec).clone());
let system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
Self { state, chain_spec, evm_config, system_caller }
}
}

6
crates/evm/src/system_calls/mod.rs
View File

@ -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;
@ -46,7 +46,7 @@ impl OnStateHook for NoopHook {
#[allow(missing_debug_implementations)]
pub struct SystemCaller<EvmConfig, Chainspec> {
evm_config: EvmConfig,
chain_spec: Chainspec,
chain_spec: Arc<Chainspec>,
/// Optional hook to be called after each state change.
hook: Option<Box<dyn OnStateHook>>,
}
@ -54,7 +54,7 @@ pub struct SystemCaller<EvmConfig, Chainspec> {
impl<EvmConfig, Chainspec> SystemCaller<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: EvmConfig, chain_spec: Chainspec) -> Self {
pub const fn new(evm_config: EvmConfig, chain_spec: Arc<Chainspec>) -> Self {
Self { evm_config, chain_spec, hook: None }
}

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

@ -90,7 +90,7 @@ where
{
/// Creates a new [`OpExecutionStrategy`]
pub fn new(state: State<DB>, chain_spec: Arc<OpChainSpec>, evm_config: EvmConfig) -> Self {
let system_caller = SystemCaller::new(evm_config.clone(), (*chain_spec).clone());
let system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
Self { state, chain_spec, evm_config, system_caller }
}
}

2
crates/optimism/payload/src/builder.rs
View File

@ -197,7 +197,7 @@ where
chain_spec.is_regolith_active_at_timestamp(attributes.payload_attributes.timestamp);
// apply eip-4788 pre block contract call
let mut system_caller = SystemCaller::new(evm_config.clone(), &chain_spec);
let mut system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
system_caller
.pre_block_beacon_root_contract_call(

2
crates/payload/validator/src/lib.rs
View File

@ -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
}
}