don't compile optimism crates with scroll feature

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

crates/optimism/bin/Cargo.toml

@@ -46,6 +46,7 @@ optimism = [
 	"reth-optimism-rpc/optimism",
 	"reth-provider/optimism"
 ]
+scroll = []
 
 dev = [
 	"reth-optimism-cli/dev"

crates/optimism/bin/src/lib.rs

@@ -26,6 +26,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 /// Re-exported from `reth_optimism_cli`.
 pub mod cli {

crates/optimism/bin/src/main.rs

@@ -1,6 +1,9 @@
 #![allow(missing_docs, rustdoc::missing_crate_level_docs)]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 use clap::Parser;
 use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};

crates/optimism/cli/Cargo.toml

@@ -121,3 +121,4 @@ serde = [
 	"reth-execution-types/serde",
 	"reth-provider/serde"
 ]
+scroll = []

crates/optimism/cli/src/lib.rs

@@ -9,6 +9,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 /// Optimism chain specification parser.
 pub mod chainspec;

crates/optimism/evm/Cargo.toml

@@ -69,3 +69,4 @@ optimism = [
 	"revm/optimism",
 	"revm-primitives/optimism"
 ]
+scroll = []

crates/optimism/evm/src/execute.rs

@@ -313,9 +313,8 @@ mod tests {
     fn create_op_state_provider() -> StateProviderTest {
         let mut db = StateProviderTest::default();
 
-        // TODO (scroll): remove at last Scroll `Account` related PR.
         let l1_block_contract_account =
-            Account { balance: U256::ZERO, bytecode_hash: None, nonce: 1, ..Default::default() };
+            Account { balance: U256::ZERO, bytecode_hash: None, nonce: 1 };
 
         let mut l1_block_storage = HashMap::default();
         // base fee

crates/optimism/evm/src/lib.rs

@@ -9,6 +9,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 extern crate alloc;
 

crates/optimism/node/Cargo.toml

@@ -117,3 +117,4 @@ test-utils = [
     "revm/test-utils",
     "reth-optimism-node/test-utils",
 ]
+scroll = []

crates/optimism/node/src/lib.rs

@@ -8,6 +8,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 /// CLI argument parsing for the optimism node.
 pub mod args;

crates/optimism/node/tests/e2e/main.rs

@@ -1,4 +1,7 @@
 #![allow(missing_docs)]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 #[cfg(feature = "optimism")]
 mod p2p;

crates/optimism/node/tests/it/main.rs

@@ -1,4 +1,7 @@
 #![allow(missing_docs)]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 #[cfg(feature = "optimism")]
 mod builder;

crates/optimism/payload/Cargo.toml

@@ -59,4 +59,5 @@ optimism = [
 	"revm/optimism",
 	"reth-execution-types/optimism",
 	"reth-optimism-consensus/optimism"
-]
+]
+scroll = []

crates/optimism/payload/src/lib.rs

@@ -10,6 +10,9 @@
 #![allow(clippy::useless_let_if_seq)]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 pub mod builder;
 pub use builder::OpPayloadBuilder;

crates/optimism/rpc/Cargo.toml

@@ -74,3 +74,4 @@ optimism = [
 	"reth-optimism-consensus/optimism",
 	"reth-optimism-payload-builder/optimism"
 ]
+scroll = []

crates/optimism/rpc/src/lib.rs

@@ -9,6 +9,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
+// Don't use the crate if `scroll` feature is used.
+#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
+#![cfg(not(feature = "scroll"))]
 
 pub mod error;
 pub mod eth;