refactor: remove op-revm/op-alloy dependencies

.github/workflows/ci.yml

@@ -43,10 +43,10 @@ jobs:
           # Windows: all features except gmp
           - os: windows-latest
             rust: stable
-            flags: "--features std,secp256k1,op,overrides,call-util,engine,asm-keccak,rpc"
+            flags: "--features std,secp256k1,overrides,call-util,engine,asm-keccak,rpc"
           - os: windows-latest
             rust: nightly
-            flags: "--features std,secp256k1,op,overrides,call-util,engine,asm-keccak,rpc"
+            flags: "--features std,secp256k1,overrides,call-util,engine,asm-keccak,rpc"
     steps:
       - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master

Cargo.toml

@@ -48,15 +48,8 @@ alloy-hardforks = { version = "0.4.7" }
 alloy-rpc-types-eth = { version = "1.5.2", default-features = false }
 alloy-rpc-types-engine = { version = "1.5.2", default-features = false }
 
-# op-alloy
-alloy-op-hardforks = { version = "0.4.7" }
-op-alloy = { version = "0.24", default-features = false, features = [
-    "consensus",
-] }
-
 # revm
 revm = { version = "36.0.0", default-features = false }
-op-revm = { version = "17.0.0", default-features = false }
 
 # tracing
 tracing = { version = "0.1", default-features = false }

crates/evm/Cargo.toml

@@ -19,13 +19,10 @@ alloy-primitives.workspace = true
 alloy-sol-types.workspace = true
 alloy-eips.workspace = true
 alloy-hardforks.workspace = true
-alloy-op-hardforks = { workspace = true, optional = true }
 alloy-rpc-types-eth = { workspace = true, optional = true }
 alloy-rpc-types-engine = { workspace = true, optional = true }
 
 revm.workspace = true
-op-revm = { workspace = true, optional = true }
-op-alloy = { workspace = true, optional = true }
 
 auto_impl.workspace = true
 derive_more.workspace = true
@@ -50,19 +47,16 @@ std = [
 	"alloy-eips/std",
 	"alloy-sol-types/std",
 	"derive_more/std",
-	"op-revm?/std",
 	"thiserror/std",
-	"op-alloy?/std",
 	"alloy-rpc-types-eth?/std",
 	"alloy-rpc-types-engine?/std",
 	"tracing/std"
 ]
 gmp = [
     "revm/gmp",
 ]
-op = ["op-revm", "op-alloy", "alloy-op-hardforks"]
 overrides = ["dep:alloy-rpc-types-eth"]
 call-util = ["overrides"]
-engine = ["dep:alloy-rpc-types-engine", "op-alloy?/rpc-types-engine"]
+engine = ["dep:alloy-rpc-types-engine"]
 asm-keccak = ["alloy-primitives/asm-keccak", "revm/asm-keccak"]
-rpc = ["dep:alloy-rpc-types-eth", "op-alloy?/rpc-types"]
+rpc = ["dep:alloy-rpc-types-eth"]

crates/evm/src/error.rs

@@ -91,13 +91,3 @@ where
         }
     }
 }
-
-#[cfg(feature = "op")]
-impl InvalidTxError for op_revm::OpTransactionError {
-    fn as_invalid_tx_err(&self) -> Option<&InvalidTransaction> {
-        match self {
-            Self::Base(tx) => Some(tx),
-            _ => None,
-        }
-    }
-}

crates/evm/src/eth/mod.rs

@@ -2,9 +2,6 @@
 
 pub use env::NextEvmEnvAttributes;
 
-#[cfg(feature = "op")]
-pub(crate) use env::EvmEnvInput;
-
 use crate::{env::EvmEnv, evm::EvmFactory, precompiles::PrecompilesMap, Database, Evm};
 use alloy_primitives::{Address, Bytes};
 use core::{

crates/evm/src/lib.rs

@@ -24,8 +24,6 @@ pub mod traits;
 pub use traits::*;
 #[cfg(feature = "call-util")]
 pub mod call;
-#[cfg(feature = "op")]
-pub mod op;
 #[cfg(feature = "overrides")]
 pub mod overrides;
 pub mod precompiles;
@@ -36,9 +34,7 @@ pub mod tracing;
 
 mod either;
 
-// re-export revm and op-revm
-#[cfg(feature = "op")]
-pub use op_revm;
+// re-export revm
 pub use revm;
 
 pub use eth::spec_id::{spec, spec_by_timestamp_and_block_number};