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

feat: update SystemCaller (#11718)

Browse Source
This commit is contained in:
Federico Gimenez
2024-10-14 17:52:34 +02:00
committed by GitHub
parent f684dd4c4c
commit 600a394571
11 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/engine/invalid-block-hooks/src/witness.rs
View File

@ -84,7 +84,8 @@ where
EnvWithHandlerCfg::new_with_cfg_env(cfg, block_env, Default::default()),
);
let mut system_caller = SystemCaller::new(&self.evm_config, self.provider.chain_spec());
let mut system_caller =
SystemCaller::new(self.evm_config.clone(), self.provider.chain_spec());
// Apply pre-block system contract calls.
system_caller.apply_pre_execution_changes(&block.clone().unseal(), &mut evm)?;

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

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

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

@ -141,10 +141,12 @@ where
where
DB: Database,
DB::Error: Into<ProviderError> + Display,
F: OnStateHook,
F: OnStateHook + 'static,
{
let mut system_caller =
SystemCaller::new(&self.evm_config, &self.chain_spec).with_state_hook(state_hook);
let mut system_caller = SystemCaller::new(self.evm_config.clone(), &self.chain_spec);
if let Some(hook) = state_hook {
system_caller.with_state_hook(Some(Box::new(hook) as Box<dyn OnStateHook>));
}
system_caller.apply_pre_execution_changes(block, &mut evm)?;
@ -290,7 +292,7 @@ where
state_hook: Option<F>,
) -> Result<EthExecuteOutput, BlockExecutionError>
where
F: OnStateHook,
F: OnStateHook + 'static,
{
// 1. prepare state on new block
self.on_new_block(&block.header);
@ -396,7 +398,7 @@ where
state_hook: F,
) -> Result<Self::Output, Self::Error>
where
F: OnStateHook,
F: OnStateHook + 'static,
{
let BlockExecutionInput { block, total_difficulty } = input;
let EthExecuteOutput { receipts, requests, gas_used } = self

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

@ -160,7 +160,7 @@ where
let block_number = initialized_block_env.number.to::<u64>();
let mut system_caller = SystemCaller::new(&evm_config, chain_spec.clone());
let mut system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
// apply eip-4788 pre block contract call
system_caller

2
crates/evm/src/either.rs
View File

@ -97,7 +97,7 @@ where
state_hook: F,
) -> Result<Self::Output, Self::Error>
where
F: OnStateHook,
F: OnStateHook + 'static,
{
match self {
Self::Left(a) => a.execute_with_state_hook(input, state_hook),

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

@ -56,7 +56,7 @@ pub trait Executor<DB> {
state_hook: F,
) -> Result<Self::Output, Self::Error>
where
F: OnStateHook;
F: OnStateHook + 'static;
}
/// A general purpose executor that can execute multiple inputs in sequence, validate the outputs,

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

@ -1,7 +1,7 @@
//! System contract call functions.
use crate::ConfigureEvm;
use alloc::vec::Vec;
use alloc::{boxed::Box, vec::Vec};
use core::fmt::Display;
use reth_chainspec::EthereumHardforks;
use reth_execution_errors::BlockExecutionError;
@ -42,27 +42,26 @@ impl OnStateHook for NoopHook {
///
/// 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,
pub struct SystemCaller<EvmConfig, Chainspec> {
evm_config: EvmConfig,
chain_spec: Chainspec,
/// Optional hook to be called after each state change.
hook: Option<Hook>,
hook: Option<Box<dyn OnStateHook>>,
}
impl<'a, EvmConfig, Chainspec> SystemCaller<'a, EvmConfig, Chainspec, NoopHook> {
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: &'a EvmConfig, chain_spec: Chainspec) -> Self {
pub const fn new(evm_config: EvmConfig, chain_spec: Chainspec) -> Self {
Self { evm_config, chain_spec, hook: None }
}
/// Installs a custom hook to be called after each state change.
pub fn with_state_hook<H: OnStateHook>(
self,
hook: Option<H>,
) -> SystemCaller<'a, EvmConfig, Chainspec, H> {
let Self { evm_config, chain_spec, .. } = self;
SystemCaller { evm_config, chain_spec, hook }
pub fn with_state_hook(&mut self, hook: Option<Box<dyn OnStateHook>>) -> &mut Self {
self.hook = hook;
self
}
/// Convenience method to consume the type and drop borrowed fields
pub fn finish(self) {}
}
@ -85,11 +84,10 @@ where
.build()
}
impl<EvmConfig, Chainspec, Hook> SystemCaller<'_, EvmConfig, Chainspec, Hook>
impl<EvmConfig, Chainspec> SystemCaller<EvmConfig, Chainspec>
where
EvmConfig: ConfigureEvm<Header = Header>,
Chainspec: EthereumHardforks,
Hook: OnStateHook,
{
/// Apply pre execution changes.
pub fn apply_pre_execution_changes<DB, Ext>(

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

@ -121,10 +121,12 @@ where
) -> Result<(Vec<Receipt>, u64), BlockExecutionError>
where
DB: Database<Error: Into<ProviderError> + Display>,
F: OnStateHook,
F: OnStateHook + 'static,
{
let mut system_caller =
SystemCaller::new(&self.evm_config, &self.chain_spec).with_state_hook(state_hook);
let mut system_caller = SystemCaller::new(self.evm_config.clone(), &self.chain_spec);
if let Some(hook) = state_hook {
system_caller.with_state_hook(Some(Box::new(hook) as Box<dyn OnStateHook>));
}
// apply pre execution changes
system_caller.apply_beacon_root_contract_call(
@ -306,7 +308,7 @@ where
state_hook: Option<F>,
) -> Result<(Vec<Receipt>, u64), BlockExecutionError>
where
F: OnStateHook,
F: OnStateHook + 'static,
{
// 1. prepare state on new block
self.on_new_block(&block.header);
@ -410,7 +412,7 @@ where
state_hook: F,
) -> Result<Self::Output, Self::Error>
where
F: OnStateHook,
F: OnStateHook + 'static,
{
let BlockExecutionInput { block, total_difficulty } = input;
let (receipts, gas_used) = self.execute_without_verification_with_state_hook(

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

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

3
crates/rpc/rpc-eth-api/src/helpers/pending_block.rs
View File

@ -260,8 +260,7 @@ pub trait LoadPendingBlock: EthApiTypes {
let chain_spec = self.provider().chain_spec();
let evm_config = self.evm_config().clone();
let mut system_caller = SystemCaller::new(&evm_config, chain_spec.clone());
let mut system_caller = SystemCaller::new(self.evm_config().clone(), chain_spec.clone());
let parent_beacon_block_root = if origin.is_actual_pending() {
// apply eip-4788 pre block contract call if we got the block from the CL with the real

4
crates/rpc/rpc-eth-api/src/helpers/trace.rs
View File

@ -199,7 +199,7 @@ pub trait Trace: LoadState {
// apply relevant system calls
let mut system_caller = SystemCaller::new(
Trace::evm_config(&this),
Trace::evm_config(&this).clone(),
LoadState::provider(&this).chain_spec(),
);
system_caller
@ -332,7 +332,7 @@ pub trait Trace: LoadState {
// apply relevant system calls
let mut system_caller = SystemCaller::new(
Trace::evm_config(&this),
Trace::evm_config(&this).clone(),
LoadState::provider(&this).chain_spec(),
);
system_caller