Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add constructor for OpEvm and make generic over precompiles #21

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −9
Open

chore: add constructor for OpEvm and make generic over precompiles #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63fdb32
chore: add constructor for OpEvm and make generic over precompiles
Rjected Feb 26, 2025
3b99328
chore: make all impls generic
Rjected Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions crates/op-evm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,25 @@ use core::{
use revm::{
context::{setters::ContextSetters, BlockEnv, TxEnv},
context_interface::result::{EVMError, ResultAndState},
handler::instructions::EthInstructions,
handler::{instructions::EthInstructions, PrecompileProvider},
inspector::NoOpInspector,
interpreter::interpreter::EthInterpreter,
interpreter::{interpreter::EthInterpreter, InterpreterResult},
Context, ExecuteEvm, InspectEvm, Inspector,
};
use revm_optimism::{
DefaultOp, OpBuilder, OpContext, OpHaltReason, OpSpecId, OpTransaction, OpTransactionError,
handler::precompiles::OpPrecompileProvider, DefaultOp, OpBuilder, OpContext, OpHaltReason,
OpSpecId, OpTransaction, OpTransactionError,
};

/// OP EVM implementation.
#[allow(missing_debug_implementations)] // missing revm::OpContext Debug impl
pub struct OpEvm<DB: Database, I> {
inner: revm_optimism::OpEvm<OpContext<DB>, I, EthInstructions<EthInterpreter, OpContext<DB>>>,
pub struct OpEvm<DB: Database, I, P = OpPrecompileProvider<OpContext<DB>>> {
inner:
revm_optimism::OpEvm<OpContext<DB>, I, EthInstructions<EthInterpreter, OpContext<DB>>, P>,
inspect: bool,
}

impl<DB: Database, I> OpEvm<DB, I> {
impl<DB: Database, I, P> OpEvm<DB, I, P> {
/// Provides a reference to the EVM context.
pub const fn ctx(&self) -> &OpContext<DB> {
&self.inner.0.data.ctx
Expand All @@ -47,7 +49,22 @@ impl<DB: Database, I> OpEvm<DB, I> {
}
}

impl<DB: Database, I> Deref for OpEvm<DB, I> {
impl<DB: Database, I, P> OpEvm<DB, I, P> {
/// Creates a new OP EVM instance.
pub const fn new(
evm: revm_optimism::OpEvm<
OpContext<DB>,
I,
EthInstructions<EthInterpreter, OpContext<DB>>,
P,
>,
inspect: bool,
) -> Self {
Self { inner: evm, inspect }
}
}

impl<DB: Database, I, P> Deref for OpEvm<DB, I, P> {
type Target = OpContext<DB>;

#[inline]
Expand All @@ -56,17 +73,18 @@ impl<DB: Database, I> Deref for OpEvm<DB, I> {
}
}

impl<DB: Database, I> DerefMut for OpEvm<DB, I> {
impl<DB: Database, I, P> DerefMut for OpEvm<DB, I, P> {
#[inline]
fn deref_mut(&mut self) -> &mut Self::Target {
self.ctx_mut()
}
}

impl<DB, I> Evm for OpEvm<DB, I>
impl<DB, I, P> Evm for OpEvm<DB, I, P>
where
DB: Database,
I: Inspector<OpContext<DB>>,
P: PrecompileProvider<Context = OpContext<DB>, Output = InterpreterResult>,
{
type DB = DB;
type Tx = OpTransaction<TxEnv>;
Expand Down
Loading