clean up legacy

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

crates/primitives-traits/Cargo.toml

@@ -20,7 +20,9 @@ alloy-genesis.workspace = true
 alloy-primitives.workspace = true
 alloy-rlp.workspace = true
 
-revm-primitives = { workspace = true, features = ["serde"] }
+# revm-primitives scroll re-export
+revm-primitives = { package = "reth-scroll-revm", path = "../scroll/revm", features = ["serde"] }
+reth-scroll-primitives = { workspace = true, optional = true }
 
 # misc
 byteorder = "1"
@@ -81,3 +83,4 @@ serde-bincode-compat = [
 	"alloy-consensus/serde-bincode-compat",
 	"alloy-eips/serde-bincode-compat"
 ]
+scroll = ["reth-scroll-primitives"]

crates/scroll/revm/Cargo.toml

@@ -23,8 +23,6 @@ default = ["std"]
 
 arbitrary = ["revm/arbitrary"]
 
-scroll = []
-
 serde = ["revm/serde"]
 
 std = ["revm/std"]

crates/scroll/revm/src/lib.rs

@@ -5,6 +5,5 @@ pub mod states;
 
 pub mod primitives;
 
-#[cfg(feature = "scroll")]
 pub use primitives::ScrollAccountInfo;
 pub use revm::primitives::*;

crates/scroll/storage/src/lib.rs

@@ -1,6 +1,6 @@
 //! Scroll storage implementation.
 
-use alloy_primitives::{map::Entry, Address, B256, U256};
+use alloy_primitives::{Address, B256, U256};
 use reth_revm::{
     database::EvmStateProvider,
     primitives::{AccountInfo, Bytecode},
@@ -44,11 +44,9 @@ impl<DB: EvmStateProvider> Database for ScrollStateProviderDatabase<DB> {
         let Some(account) = self.db.basic_account(address)? else { return Ok(None) };
         let Some(code_hash) = account.bytecode_hash else { return Ok(Some(account.into())) };
 
-        let bytecode_context = (account.code_size, account.poseidon_code_hash);
-        if let Entry::Vacant(entry) = self.post_execution_context.entry(code_hash) {
-            entry.insert(bytecode_context);
-        }
-
+        self.post_execution_context
+            .entry(code_hash)
+            .or_insert_with(|| (account.code_size, account.poseidon_code_hash));
         Ok(Some(account.into()))
     }