WEB3-78: Update revm requirement from 10.0 to 13.0 (#195)

Author: Wollac

Cargo.toml

@@ -38,7 +38,7 @@ clap = { version = "4.5", features = ["derive", "env"] }
 log = "0.4"
 nybbles = { version = "0.2.1", features = ["serde"] }
 once_cell = "1.19"
-revm = { version = "10.0", default-features = false, features = ["std"] }
+revm = { version = "13.0", default-features = false, features = ["std"] }
 serde = "1.0"
 serde_json = "1.0"
 test-log = "0.2.15"

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.76"
+channel = "1.79"
 components = ["clippy", "rustfmt", "rust-src"]
 targets = []
 profile = "minimal"

steel/src/host/db/alloy.rs

@@ -139,12 +139,10 @@ impl<T: Transport + Clone, N: Network, P: Provider<T, N>> Database for AlloyDb<T
         Ok(storage)
     }
 
-    fn block_hash(&mut self, number: U256) -> Result<B256, Self::Error> {
-        // SAFETY: We know number <= u64::MAX, so we can safely convert it to u64
-        let block = self.handle.block_on(
-            self.provider
-                .get_block_by_number(number.to::<u64>().into(), false),
-        )?;
+    fn block_hash(&mut self, number: u64) -> Result<B256, Self::Error> {
+        let block = self
+            .handle
+            .block_on(self.provider.get_block_by_number(number.into(), false))?;
         let header = block.unwrap().header;
         Ok(header.hash.unwrap())
     }

steel/src/host/db/trace.rs

@@ -22,7 +22,7 @@ use revm::{
 pub struct TraceDb<D> {
     accounts: HashMap<Address, HashSet<U256>>,
     contracts: HashMap<B256, Bytes>,
-    block_hash_numbers: HashSet<U256>,
+    block_hash_numbers: HashSet<u64>,
 
     inner: D,
 }
@@ -46,7 +46,7 @@ impl<D: Database> TraceDb<D> {
         &self.contracts
     }
     /// Returns all the queried block numbers.
-    pub fn block_hash_numbers(&self) -> &HashSet<U256> {
+    pub fn block_hash_numbers(&self) -> &HashSet<u64> {
         &self.block_hash_numbers
     }
 
@@ -89,7 +89,7 @@ impl<DB: Database> Database for TraceDb<DB> {
         Ok(storage)
     }
 
-    fn block_hash(&mut self, number: U256) -> Result<B256, Self::Error> {
+    fn block_hash(&mut self, number: u64) -> Result<B256, Self::Error> {
         log::trace!("BLOCK: number={}", number);
         let block_hash = self.inner.block_hash(number)?;
         self.block_hash_numbers.insert(number);

steel/src/host/mod.rs

@@ -148,8 +148,7 @@ where
 
         // retrieve ancestor block headers
         let mut ancestors = Vec::new();
-        if let Some(block_hash_min_number) = db.block_hash_numbers().iter().min() {
-            let block_hash_min_number: u64 = block_hash_min_number.to();
+        if let Some(&block_hash_min_number) = db.block_hash_numbers().iter().min() {
             for number in (block_hash_min_number..block_number).rev() {
                 let rpc_block = provider
                     .get_block_by_number(number.into(), false)

steel/src/state.rs

@@ -81,9 +81,7 @@ impl StateDb {
     }
 
     #[inline]
-    fn block_hash(&self, number: U256) -> B256 {
-        // block number is never bigger then u64::MAX
-        let number: u64 = number.to();
+    fn block_hash(&self, number: u64) -> B256 {
         let hash = self
             .block_hashes
             .get(&number)
@@ -176,7 +174,7 @@ impl Database for WrapStateDb<'_> {
 
     /// Get block hash by block number.
     #[inline]
-    fn block_hash(&mut self, number: U256) -> Result<B256, Self::Error> {
+    fn block_hash(&mut self, number: u64) -> Result<B256, Self::Error> {
         Ok(self.inner.block_hash(number))
     }
 }