[fix] ci (#4)

* fix ci

* update branch

* fix clippy,test,docs

* fix clippy

* fix clippy

.github/workflows/ci.yml

@@ -6,9 +6,9 @@ concurrency:
 
 on:
   push:
-    branches: [main, "release/**"]
+    branches: [ main, "release/**", "scroll-evm-executor/**" ]
   pull_request:
-    branches: [main, "release/**"]
+    branches: [ main, "release/**", "scroll-evm-executor/**" ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -21,8 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: ["stable", "beta", "nightly"]
-        flags: ["--no-default-features", "", "--all-features"]
+        rust: [ "stable", "beta", "nightly" ]
+        flags: [ "--no-default-features", "", "--features=\"all, scroll\"", "--features=\"all, optimism\"" ]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
@@ -79,9 +79,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - run: cargo clippy --workspace --all-targets --all-features
+      - run: cargo clippy --workspace --all-targets --features all,scroll
         env:
           RUSTFLAGS: -Dwarnings
+      - run: cargo clippy --workspace --all-targets --features all,optimism
 
   docs:
     name: docs
@@ -92,7 +93,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rust-docs
-      - run: cargo doc --workspace --all-features --no-deps --document-private-items
+      - run: cargo doc --workspace --features all,scroll --no-deps --document-private-items
         env:
           RUSTDOCFLAGS: "--cfg docsrs -D warnings"
 

.github/workflows/ethereum-tests.yml

@@ -6,9 +6,9 @@ concurrency:
 
 on:
   push:
-    branches: [main, "release/**"]
+    branches: [ main, "release/**", "scroll-evm-executor/**" ]
   pull_request:
-    branches: [main, "release/**"]
+    branches: [ main, "release/**", "scroll-evm-executor/**" ]
 
 jobs:
   tests-stable:
@@ -17,8 +17,8 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        profile: [ethtests, release]
-        target: [i686-unknown-linux-gnu, x86_64-unknown-linux-gnu]
+        profile: [ ethtests, release ]
+        target: [ i686-unknown-linux-gnu, x86_64-unknown-linux-gnu ]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

bins/revme/src/cmd/statetest/runner.rs

@@ -352,7 +352,7 @@ pub fn execute_test_suite(
                     .build();
                 let mut evm = Evm::builder()
                     .with_db(&mut state)
-                    .modify_env(|e| *e = env.clone())
+                    .modify_env(|e| e.clone_from(&env))
                     .with_spec_id(spec_id)
                     .build();
 

crates/interpreter/Cargo.toml

@@ -66,3 +66,12 @@ optional_eip3607 = ["revm-primitives/optional_eip3607"]
 optional_gas_refund = ["revm-primitives/optional_gas_refund"]
 optional_no_base_fee = ["revm-primitives/optional_no_base_fee"]
 optional_beneficiary_reward = ["revm-primitives/optional_beneficiary_reward"]
+
+all = [
+    "std",
+    "serde",
+    "arbitrary",
+    "asm-keccak",
+    "portable",
+    "dev",
+]

crates/interpreter/src/interpreter.rs

@@ -217,7 +217,9 @@ impl Interpreter {
         let out_offset = call_outcome.memory_start();
         let out_len = call_outcome.memory_length();
 
-        self.return_data_buffer = call_outcome.output().to_owned();
+        call_outcome
+            .output()
+            .clone_into(&mut self.return_data_buffer);
         let target_len = min(out_len, self.return_data_buffer.len());
 
         match call_outcome.instruction_result() {

crates/precompile/Cargo.toml

@@ -81,6 +81,14 @@ portable = ["revm-primitives/portable", "c-kzg?/portable"]
 # In Linux it passes. If you don't require to build wasm on win/mac, it is safe to use it and it is enabled by default.
 secp256k1 = ["dep:secp256k1"]
 
+all = [
+    "std",
+    "asm-keccak",
+    "c-kzg",
+    "portable",
+    "secp256k1",
+]
+
 [[bench]]
 name = "bench"
 path = "benches/bench.rs"

crates/primitives/Cargo.toml

@@ -99,3 +99,12 @@ optional_beneficiary_reward = []
 
 # See comments in `revm-precompile`
 c-kzg = ["dep:c-kzg", "dep:once_cell", "dep:derive_more"]
+
+all = [
+    "std",
+    "serde",
+    "arbitrary",
+    "asm-keccak",
+    "portable",
+    "dev",
+]

crates/primitives/src/state.rs

@@ -220,15 +220,16 @@ impl Default for AccountInfo {
 }
 
 impl PartialEq for AccountInfo {
+    #[allow(clippy::let_and_return)]
     fn eq(&self, other: &Self) -> bool {
         let eq = self.balance == other.balance
             && self.nonce == other.nonce
             && self.code_hash == other.code_hash;
+
         #[cfg(all(debug_assertions, feature = "scroll"))]
         if eq {
             assert_eq!(self.keccak_code_hash, other.keccak_code_hash);
         }
-
         eq
     }
 }
@@ -329,7 +330,7 @@ impl AccountInfo {
 
 #[cfg(test)]
 mod tests {
-    use crate::{Account, KECCAK_EMPTY, U256};
+    use crate::{Account, U256};
 
     #[test]
     fn account_is_empty_balance() {
@@ -366,7 +367,13 @@ mod tests {
         account.info.code_hash = [0; 32].into();
         assert!(account.is_empty());
 
-        account.info.code_hash = KECCAK_EMPTY;
+        cfg_if::cfg_if! {
+            if #[cfg(feature = "scroll")] {
+                account.info.code_hash = crate::POSEIDON_EMPTY;
+            } else {
+                account.info.code_hash = crate::KECCAK_EMPTY;
+            }
+        }
         assert!(account.is_empty());
     }
 

crates/revm/Cargo.toml

@@ -116,6 +116,19 @@ optional_beneficiary_reward = ["revm-interpreter/optional_beneficiary_reward"]
 secp256k1 = ["revm-precompile/secp256k1"]
 c-kzg = ["revm-precompile/c-kzg"]
 
+all = [
+    "std",
+    "serde",
+    "serde-json",
+    "arbitrary",
+    "asm-keccak",
+    "portable",
+    "ethersdb",
+    "dev",
+    "revm-interpreter/all",
+    "revm-precompile/all",
+]
+
 [[example]]
 name = "fork_ref_transact"
 path = "../../examples/fork_ref_transact.rs"

crates/revm/src/builder.rs

@@ -487,7 +487,10 @@ mod test {
         let code = Bytecode::new_raw([0xEF, 0x00].into());
         #[cfg(feature = "scroll")]
         let poseidon_code_hash = code.poseidon_hash_slow();
+        #[cfg(feature = "scroll")]
         let keccak_code_hash = code.keccak_hash_slow();
+        #[cfg(not(feature = "scroll"))]
+        let keccak_code_hash = code.hash_slow();
         let to_addr = address!("ffffffffffffffffffffffffffffffffffffffff");
 
         // initialize the custom context and make sure it's zero
@@ -551,7 +554,10 @@ mod test {
         let code = Bytecode::new_raw([0xEF, 0x00].into());
         #[cfg(feature = "scroll")]
         let poseidon_code_hash = code.poseidon_hash_slow();
+        #[cfg(feature = "scroll")]
         let keccak_code_hash = code.keccak_hash_slow();
+        #[cfg(not(feature = "scroll"))]
+        let keccak_code_hash = code.hash_slow();
         let to_addr = address!("ffffffffffffffffffffffffffffffffffffffff");
 
         let mut evm = Evm::builder()

crates/revm/src/context/evm_context.rs

@@ -396,7 +396,7 @@ mod tests {
                 nonce: 0,
                 balance: bal,
                 #[cfg(not(feature = "scroll"))]
-                code_hash: by.clone().keccak_hash_slow(),
+                code_hash: by.clone().hash_slow(),
                 #[cfg(feature = "scroll")]
                 code_hash: by.clone().poseidon_hash_slow(),
                 #[cfg(feature = "scroll")]

crates/revm/src/db/in_memory_db.rs

@@ -531,7 +531,7 @@ mod tests {
         let serialized = serde_json::to_string(&init_state).unwrap();
         let deserialized: CacheDB<EmptyDB> = serde_json::from_str(&serialized).unwrap();
 
-        assert!(deserialized.accounts.get(&account).is_some());
+        assert!(deserialized.accounts.contains_key(&account));
         assert_eq!(
             deserialized.accounts.get(&account).unwrap().info.nonce,
             nonce

crates/revm/src/db/states/transition_account.rs

@@ -85,7 +85,7 @@ impl TransitionAccount {
     /// Update new values of transition. Don't override old values.
     /// Both account info and old storages need to be left intact.
     pub fn update(&mut self, other: Self) {
-        self.info = other.info.clone();
+        self.info.clone_from(&other.info);
         self.status = other.status;
 
         // if transition is from some to destroyed drop the storage.

crates/revm/src/inspector/eip3155.rs

@@ -192,7 +192,7 @@ impl<DB: Database> Inspector<DB> for TracerEip3155 {
 
     fn step(&mut self, interp: &mut Interpreter, context: &mut EvmContext<DB>) {
         self.gas_inspector.step(interp, context);
-        self.stack = interp.stack.data().clone();
+        self.stack.clone_from(interp.stack.data());
         self.memory = if self.include_memory {
             Some(hex::encode_prefixed(interp.shared_memory.context_memory()))
         } else {

crates/revm/src/scroll/l1block.rs

@@ -51,7 +51,7 @@ impl L1BlockInfo {
         }))
     }
 
-    /// Calculate the gas cost of a transaction based on L1 block data posted on L2, depending on the [SpecId] passed.
+    /// Calculate the gas cost of a transaction based on L1 block data posted on L2.
     pub fn calculate_tx_l1_cost(&self, input: &[u8]) -> U256 {
         let tx_l1_gas = self.data_gas(input);
         tx_l1_gas