move revm "patching" to workspace level

Signed-off-by: Gregory Edison <[email protected]>

Cargo.toml

@@ -429,7 +429,7 @@ reth-trie-db = { path = "crates/trie/db" }
 reth-trie-parallel = { path = "crates/trie/parallel" }
 
 # revm
-revm = { version = "18.0.0", features = ["std"], default-features = false }
+revm = { package = "reth-scroll-revm", path = "crates/scroll/revm", default-features = false }
 revm-inspectors = "0.11.0"
 revm-primitives = { version = "14.0.0", features = [
     "std",

crates/blockchain-tree/Cargo.toml

@@ -65,7 +65,7 @@ parking_lot.workspace = true
 assert_matches.workspace = true
 alloy-genesis.workspace = true
 alloy-consensus.workspace = true
-revm = { package = "reth-scroll-revm", path = "../scroll/revm" }
+revm.workspace = true
 
 [features]
 test-utils = [

crates/chain-state/Cargo.toml

@@ -44,15 +44,15 @@ pin-project.workspace = true
 alloy-signer = { workspace = true, optional = true }
 alloy-signer-local = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }
-revm = { package = "reth-scroll-revm", path = "../scroll/revm", optional = true }
+revm = { workspace = true, optional = true }
 
 [dev-dependencies]
 reth-testing-utils.workspace = true
 alloy-signer.workspace = true
 alloy-signer-local.workspace = true
 alloy-consensus.workspace = true
 rand.workspace = true
-revm = { package = "reth-scroll-revm", path = "../scroll/revm" }
+revm.workspace = true
 
 [features]
 test-utils = [

crates/evm/Cargo.toml

@@ -27,7 +27,7 @@ reth-storage-errors.workspace = true
 revm-primitives.workspace = true
 
 # scroll
-revm = { package = "reth-scroll-revm", path = "../scroll/revm" }
+revm.workspace = true
 reth-scroll-execution.workspace = true
 
 # alloy

crates/evm/execution-types/Cargo.toml

@@ -17,7 +17,7 @@ reth-trie.workspace = true
 reth-primitives-traits.workspace = true
 
 # scroll
-revm = { package = "reth-scroll-revm", path = "../../scroll/revm" }
+revm.workspace = true
 
 # alloy
 alloy-primitives.workspace = true

crates/revm/Cargo.toml

@@ -22,7 +22,6 @@ reth-trie = { workspace = true, optional = true }
 reth-primitives-traits.workspace = true
 
 # scroll
-reth-scroll-revm = { workspace = true, optional = true }
 reth-scroll-execution.workspace = true
 
 # alloy
@@ -56,7 +55,6 @@ test-utils = [
 	"revm/test-utils",
 	"reth-prune-types/test-utils",
     "reth-primitives-traits/test-utils",
-    "reth-scroll-revm?/test-utils",
 	"reth-scroll-execution/test-utils"
 ]
 serde = [
@@ -65,9 +63,5 @@ serde = [
     "alloy-eips/serde",
     "alloy-primitives/serde",
     "alloy-consensus/serde",
-    "reth-scroll-revm?/serde"
-]
-scroll = [
-    "reth-primitives/scroll",
-    "reth-scroll-revm/scroll"
 ]
+scroll = ["reth-primitives/scroll"]

crates/revm/src/cached.rs

@@ -4,9 +4,12 @@ use alloy_primitives::{
     Address, B256, U256,
 };
 use core::cell::RefCell;
-use revm::primitives::{
-    db::{Database, DatabaseRef},
-    AccountInfo, Bytecode,
+use revm::{
+    primitives::{
+        db::{Database, DatabaseRef},
+        Bytecode,
+    },
+    shared::AccountInfo,
 };
 
 /// A container type that caches reads from an underlying [`DatabaseRef`].

crates/revm/src/database.rs

@@ -3,11 +3,7 @@ use alloy_primitives::{Address, B256, U256};
 use core::ops::{Deref, DerefMut};
 use reth_primitives::Account;
 use reth_storage_errors::provider::{ProviderError, ProviderResult};
-use revm::{
-    db::DatabaseRef,
-    primitives::{AccountInfo, Bytecode},
-    Database,
-};
+use revm::{db::DatabaseRef, primitives::Bytecode, shared::AccountInfo, Database};
 
 /// A helper trait responsible for providing state necessary for EVM execution.
 ///

crates/revm/src/either.rs

@@ -1,8 +1,5 @@
 use alloy_primitives::{Address, B256, U256};
-use revm::{
-    primitives::{AccountInfo, Bytecode},
-    Database,
-};
+use revm::{primitives::Bytecode, shared::AccountInfo, Database};
 
 /// An enum type that can hold either of two different [`Database`] implementations.
 ///

crates/revm/src/witness.rs

@@ -46,11 +46,7 @@ impl ExecutionWitnessRecord {
             let hashed_address = keccak256(address);
             #[cfg(feature = "scroll")]
             let hashed_account = account.account.as_ref().map(|a| {
-                Into::<reth_scroll_revm::AccountInfo>::into((
-                    a.info.clone(),
-                    statedb.database.context(),
-                ))
-                .into()
+                Into::<revm::AccountInfo>::into((a.info.clone(), statedb.database.context())).into()
             });
             #[cfg(not(feature = "scroll"))]
             let hashed_account = account.account.as_ref().map(|a| a.info.clone().into());

crates/rpc/rpc-eth-types/Cargo.toml

@@ -37,7 +37,7 @@ revm-primitives = { workspace = true, features = ["dev"] }
 alloy-eips.workspace = true
 
 # scroll
-revm = { package = "reth-scroll-revm", path = "../../scroll/revm" }
+revm.workspace = true
 reth-scroll-storage = { workspace = true, optional = true }
 
 # rpc

crates/scroll/execution/Cargo.toml

@@ -17,17 +17,13 @@ revm.workspace = true
 
 # scroll
 reth-scroll-primitives = { workspace = true, optional = true }
-reth-scroll-revm.workspace = true
 
 # misc
 auto_impl.workspace = true
 
 [features]
 scroll = [
     "reth-scroll-primitives",
-    "reth-scroll-revm/scroll",
-]
-test-utils = [
-	"reth-scroll-revm/test-utils",
-	"revm/test-utils"
+    "revm/scroll",
 ]
+test-utils = ["revm/test-utils"]

crates/scroll/execution/src/context.rs

@@ -8,17 +8,15 @@ pub trait FinalizeExecution<Output> {
     fn finalize(&mut self) -> Output;
 }
 
-impl<DB: Database + ContextFul> FinalizeExecution<reth_scroll_revm::states::ScrollBundleState>
-    for State<DB>
-{
-    fn finalize(&mut self) -> reth_scroll_revm::states::ScrollBundleState {
+impl<DB: Database + ContextFul> FinalizeExecution<revm::states::ScrollBundleState> for State<DB> {
+    fn finalize(&mut self) -> revm::states::ScrollBundleState {
         let bundle = self.take_bundle();
         (bundle, self.database.context()).into()
     }
 }
 
-impl<DB: Database> FinalizeExecution<reth_scroll_revm::shared::BundleState> for State<DB> {
-    fn finalize(&mut self) -> reth_scroll_revm::shared::BundleState {
+impl<DB: Database> FinalizeExecution<revm::shared::BundleState> for State<DB> {
+    fn finalize(&mut self) -> revm::shared::BundleState {
         self.take_bundle()
     }
 }

crates/scroll/revm/Cargo.toml

@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 # revm
-revm.workspace = true
+revm = { version = "18.0.0", features = ["std"], default-features = false }
 
 # scroll
 reth-scroll-primitives.workspace = true
@@ -23,6 +23,7 @@ serde = { workspace = true, optional = true }
 
 [features]
 default = ["std"]
+dev = ["revm/dev"]
 arbitrary = [
 	"revm/arbitrary",
 	"reth-scroll-primitives/arbitrary"
@@ -40,3 +41,9 @@ std = [
 	"revm/std",
 	"serde/std"
 ]
+
+blst = ["revm/blst"]
+optional_block_gas_limit =  ["revm/optional_block_gas_limit"]
+optional_eip3607 = ["revm/optional_eip3607"]
+optional_no_base_fee = ["revm/optional_no_base_fee"]
+secp256k1 = ["revm/secp256k1"]

crates/storage/provider/Cargo.toml

@@ -41,7 +41,7 @@ alloy-rpc-types-engine.workspace = true
 alloy-consensus.workspace = true
 
 # scroll
-revm = { package = "reth-scroll-revm", path = "../../scroll/revm" }
+revm.workspace = true
 reth-scroll-primitives = { workspace = true, optional = true }
 
 # optimism

crates/trie/db/Cargo.toml

@@ -21,7 +21,7 @@ reth-storage-errors.workspace = true
 reth-trie-common.workspace = true
 reth-trie.workspace = true
 
-revm = { package = "reth-scroll-revm", path = "../../scroll/revm" }
+revm.workspace = true
 
 # alloy
 alloy-rlp.workspace = true

crates/trie/trie/Cargo.toml

@@ -21,7 +21,7 @@ reth-trie-common.workspace = true
 
 # revm re-export scroll
 reth-primitives-traits.workspace = true
-revm = { package = "reth-scroll-revm", path = "../../scroll/revm" }
+revm.workspace = true
 
 # alloy
 alloy-rlp.workspace = true