chore: use builtin optimism fn (#7522)

This commit is contained in:
Matthias Seitz
2024-04-09 17:56:54 +02:00
committed by GitHub
parent fe27dc64dc
commit 6c633e9338

View File

@@ -1,7 +1,7 @@
use reth_node_api::{ConfigureEvm, ConfigureEvmEnv};
use reth_primitives::{
revm::{config::revm_spec, env::fill_op_tx_env},
revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, HandlerCfg, SpecId, TxEnv},
revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, TxEnv},
Address, Bytes, ChainSpec, Head, Header, Transaction, U256,
};
use revm::{inspector_handle_register, Database, Evm, EvmBuilder, GetInspector};
@@ -48,8 +48,7 @@ impl ConfigureEvmEnv for OptimismEvmConfig {
impl ConfigureEvm for OptimismEvmConfig {
fn evm<'a, DB: Database + 'a>(&self, db: DB) -> Evm<'a, (), DB> {
let handler_cfg = HandlerCfg { spec_id: SpecId::LATEST, is_optimism: true };
EvmBuilder::default().with_db(db).with_handler_cfg(handler_cfg).build()
EvmBuilder::default().with_db(db).optimism().build()
}
fn evm_with_inspector<'a, DB, I>(&self, db: DB, inspector: I) -> Evm<'a, I, DB>
@@ -57,11 +56,10 @@ impl ConfigureEvm for OptimismEvmConfig {
DB: Database + 'a,
I: GetInspector<DB>,
{
let handler_cfg = HandlerCfg { spec_id: SpecId::LATEST, is_optimism: true };
EvmBuilder::default()
.with_db(db)
.with_external_context(inspector)
.with_handler_cfg(handler_cfg)
.optimism()
.append_handler_register(inspector_handle_register)
.build()
}
@@ -71,6 +69,7 @@ impl ConfigureEvm for OptimismEvmConfig {
mod tests {
use super::*;
use reth_primitives::revm_primitives::{BlockEnv, CfgEnv};
use revm::primitives::SpecId;
#[test]
#[ignore]