Small cleanup

.github/workflows/ethereum-tests.yml

@@ -21,6 +21,7 @@ jobs:
         with:
           repository: ethereum/tests
           path: ethtests
+          submodules: recursive,
 
       - name: Install toolchain
         uses: actions-rs/toolchain@v1

bins/revme/src/statetest/models/spec.rs

@@ -44,23 +44,3 @@ impl SpecName {
         }
     }
 }
-
-/*
-    spec!(FRONTIER);
-    // FRONTIER_THAWING no EVM spec change
-    spec!(HOMESTEAD);
-    // DAO_FORK no EVM spec change
-    spec!(TANGERINE);
-    spec!(SPURIOUS_DRAGON);
-    spec!(BYZANTIUM);
-    // CONSTANTINOPLE was overriden with PETERSBURG
-    spec!(PETERSBURG);
-    spec!(ISTANBUL);
-    // MUIR_GLACIER no EVM spec change
-    spec!(BERLIN);
-    spec!(LONDON);
-    // ARROW_GLACIER no EVM spec change
-    // GRAT_GLACIER no EVM spec change
-    spec!(MERGE);
-    spec!(LATEST);
-*/

bins/revme/src/statetest/runner.rs

@@ -286,7 +286,7 @@ pub fn run(test_files: Vec<PathBuf>) -> Result<(), TestError> {
     let mut joins: Vec<std::thread::JoinHandle<Result<(), TestError>>> = Vec::new();
     let queue = Arc::new(Mutex::new((0, test_files)));
     let elapsed = Arc::new(Mutex::new(std::time::Duration::ZERO));
-    for _ in 0..1 {
+    for _ in 0..10 {
         let queue = queue.clone();
         let endjob = endjob.clone();
         let console_bar = console_bar.clone();

bins/revme/src/statetest/trace.rs

@@ -141,12 +141,12 @@ impl<DB: Database> Inspector<DB> for CustomPrintTracer {
         is_static: bool,
     ) -> (Return, Gas, Bytes) {
         println!(
-            "SM CALL:   {:?},context:{:?}, is_static:{:?}, transfer:{:?}, input:", //{:?}",
+            "SM CALL:   {:?},context:{:?}, is_static:{:?}, transfer:{:?}, input_size:{:?}",
             inputs.contract,
             inputs.context,
             is_static,
             inputs.transfer,
-            //hex::encode(&inputs.input),
+            inputs.input.len(),
         );
         (Return::Continue, Gas::new(0), Bytes::new())
     }

crates/revm/src/db/in_memory_db.rs

@@ -17,7 +17,7 @@ impl InMemoryDB {
 /// Memory backend, storing all state values in a `Map` in memory.
 #[derive(Debug, Clone)]
 pub struct CacheDB<ExtDB: DatabaseRef> {
-    /// Account info where None means it is not existing. None existing state is needed for Pre TANGERINE forks.
+    /// Account info where None means it is not existing. Not existing state is needed for Pre TANGERINE forks.
     /// `code` is always `None`, and bytecode can be found in `contracts`.
     pub accounts: Map<H160, DbAccount>,
     pub contracts: Map<H256, Bytecode>,

crates/revm/src/journaled_state.rs

@@ -2,7 +2,7 @@ use crate::{interpreter::bytecode::Bytecode, models::SelfDestructResult, Return,
 use alloc::{vec, vec::Vec};
 use core::mem::{self};
 use hashbrown::{hash_map::Entry, HashMap as Map};
-use primitive_types::{H160, H256, U256};
+use primitive_types::{H160, U256};
 
 use crate::{db::Database, AccountInfo, Log};
 
@@ -604,10 +604,62 @@ impl JournaledState {
 }
 
 fn is_precompile(address: H160, num_of_precompiles: usize) -> bool {
-    let u256: H256 = address.into();
-    let u256: U256 = U256::from_big_endian(u256.as_bytes());
-
-    let first = u256.0[0].wrapping_sub(1);
+    if !address[..18].iter().all(|i| *i == 0) {
+        return false;
+    }
+    let num = u16::from_be_bytes([address[18], address[19]]);
+    num.wrapping_sub(1) < num_of_precompiles as u16
+}
 
-    u256.0[3] == 0 && u256.0[2] == 0 && u256.0[1] == 0 && first < num_of_precompiles as u64
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_is_precompile() {
+        assert_eq!(
+            is_precompile(
+                H160([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+                3
+            ),
+            false,
+            "Zero is not precompile"
+        );
+
+        assert_eq!(
+            is_precompile(
+                H160([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9]),
+                3
+            ),
+            false,
+            "0x100..0 is not precompile"
+        );
+
+        assert_eq!(
+            is_precompile(
+                H160([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4]),
+                3
+            ),
+            false,
+            "0x000..4 is not precompile"
+        );
+
+        assert_eq!(
+            is_precompile(
+                H160([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]),
+                3
+            ),
+            true,
+            "0x00..01 is precompile"
+        );
+
+        assert_eq!(
+            is_precompile(
+                H160([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3]),
+                3
+            ),
+            true,
+            "0x000..3 is precompile"
+        );
+    }
 }

crates/revm/src/specification.rs

@@ -3,28 +3,28 @@ use num_enum::TryFromPrimitive;
 use revm_precompiles::SpecId as PrecompileId;
 
 /// SpecId and their activation block
-/// Information was got from: https://github.com/ethereum/execution-specs
+/// Information was obtained from: https://github.com/ethereum/execution-specs
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, TryFromPrimitive, Eq, PartialEq, Hash, Ord, PartialOrd)]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
 #[allow(non_camel_case_types)]
 pub enum SpecId {
-    FRONTIER = 0,         // Frontier	1
-    FRONTIER_THAWING = 1, // Frontier Thawing 200000
-    HOMESTEAD = 2,        // Homestead	1150000
-    DAO_FORK = 3,         // DAO Fork	1920000
-    TANGERINE = 4,        // Tangerine Whistle	2463000
-    SPURIOUS_DRAGON = 5,  //Spurious Dragon 2675000
-    BYZANTIUM = 6,        // Byzantium	4370000
-    CONSTANTINOPLE = 7,   // Constantinople 7280000 is overwriten with PETERSBURG
-    PETERSBURG = 8,       // Petersburg 7280000
-    ISTANBUL = 9,         // Istanbul	9069000
-    MUIR_GLACIER = 10,    // Muir Glacier	9200000
-    BERLIN = 11,          // Berlin	12244000
-    LONDON = 12,          // London	12965000
-    ARROW_GLACIER = 13,   //Arrow Glacier	13773000
-    GRAY_GLACIER = 14,    // Gray Glacier	15050000
-    MERGE = 15,           // Paris	TBD (Depends on difficulty)
+    FRONTIER = 0,         // Frontier	            0
+    FRONTIER_THAWING = 1, // Frontier Thawing       200000
+    HOMESTEAD = 2,        // Homestead	            1150000
+    DAO_FORK = 3,         // DAO Fork	            1920000
+    TANGERINE = 4,        // Tangerine Whistle	    2463000
+    SPURIOUS_DRAGON = 5,  // Spurious Dragon        2675000
+    BYZANTIUM = 6,        // Byzantium	            4370000
+    CONSTANTINOPLE = 7,   // Constantinople         7280000 is overwriten with PETERSBURG
+    PETERSBURG = 8,       // Petersburg             7280000
+    ISTANBUL = 9,         // Istanbul	            9069000
+    MUIR_GLACIER = 10,    // Muir Glacier	        9200000
+    BERLIN = 11,          // Berlin	                12244000
+    LONDON = 12,          // London	                12965000
+    ARROW_GLACIER = 13,   // Arrow Glacier	        13773000
+    GRAY_GLACIER = 14,    // Gray Glacier	        15050000
+    MERGE = 15,           // Paris/Merge	        TBD (Depends on difficulty)
     LATEST = 16,
 }