chore: bump revm (foundry-rs#5792)

* chore: bump revm

* chore: update env chain ID to u64

* chore: drop fork

* fix tests

* bump

Author: DaniPopes

Cargo.lock

@@ -784,7 +784,7 @@ impl NodeConfig {
 
         let mut cfg = CfgEnv::default();
         cfg.spec_id = self.get_hardfork().into();
-        cfg.chain_id = rU256::from(self.get_chain_id());
+        cfg.chain_id = self.get_chain_id();
         cfg.limit_contract_code_size = self.code_size_limit;
         // EIP-3607 rejects transactions from senders with deployed code.
         // If EIP-3607 is enabled it can cause issues during fuzz/invariant tests if the
@@ -936,7 +936,7 @@ latest block number: {latest_block}"
 
                     // need to update the dev signers and env with the chain id
                     self.set_chain_id(Some(chain_id));
-                    env.cfg.chain_id = rU256::from(chain_id);
+                    env.cfg.chain_id = chain_id;
                     env.tx.chain_id = chain_id.into();
                     chain_id
                 };

crates/anvil/src/config.rs

@@ -365,7 +365,7 @@ impl Backend {
             // update all settings related to the forked block
             {
                 let mut env = self.env.write();
-                env.cfg.chain_id = rU256::from(fork.chain_id());
+                env.cfg.chain_id = fork.chain_id();
 
                 env.block = BlockEnv {
                     number: rU256::from(fork_block_number),

crates/anvil/src/eth/backend/mem/mod.rs

@@ -86,7 +86,7 @@ impl Genesis {
     /// Applies all settings to the given `env`
     pub fn apply(&self, env: &mut Env) {
         if let Some(chain_id) = self.chain_id() {
-            env.cfg.chain_id = rU256::from(chain_id);
+            env.cfg.chain_id = chain_id;
         }
         if let Some(timestamp) = self.timestamp {
             env.block.timestamp = rU256::from(timestamp);

crates/anvil/src/genesis.rs

@@ -66,6 +66,7 @@ walkdir = "2"
 semver = "1"
 
 [dev-dependencies]
+ethers = { workspace = true, features = ["ethers-solc", "rustls"] }
 foundry-utils.workspace = true
 tempfile = "3"
 

crates/evm/Cargo.toml

@@ -81,24 +81,28 @@ impl DatabaseCommit for MemDb {
 ///
 /// This will also _always_ return `Some(AccountInfo)`:
 ///
-/// The [`Database`](revm::Database) implementation for `CacheDB` manages an `AccountState` for the `DbAccount`, this will be set to `AccountState::NotExisting` if the account does not exist yet. This is because there's a distinction between "non-existing" and "empty", See <https://github.com/bluealloy/revm/blob/8f4348dc93022cffb3730d9db5d3ab1aad77676a/crates/revm/src/db/in_memory_db.rs#L81-L83>
+/// The [`Database`](revm::Database) implementation for `CacheDB` manages an `AccountState` for the
+/// `DbAccount`, this will be set to `AccountState::NotExisting` if the account does not exist yet.
+/// This is because there's a distinction between "non-existing" and "empty",
+/// see <https://github.com/bluealloy/revm/blob/8f4348dc93022cffb3730d9db5d3ab1aad77676a/crates/revm/src/db/in_memory_db.rs#L81-L83>.
 /// If an account is `NotExisting`, `Database(Ref)::basic` will always return `None` for the
-/// requested `AccountInfo`. To prevent
-///
-/// This will ensure that a missing account is never marked as `NotExisting`
+/// requested `AccountInfo`. To prevent this, we ensure that a missing account is never marked as
+/// `NotExisting` by always returning `Some` with this type.
 #[derive(Debug, Default, Clone)]
 pub struct EmptyDBWrapper(EmptyDB);
 
 impl DatabaseRef for EmptyDBWrapper {
     type Error = DatabaseError;
 
-    fn basic(&self, address: B160) -> Result<Option<AccountInfo>, Self::Error> {
+    fn basic(&self, _address: B160) -> Result<Option<AccountInfo>, Self::Error> {
         // Note: this will always return `Some(AccountInfo)`, for the reason explained above
-        Ok(Some(self.0.basic(address)?.unwrap_or_default()))
+        Ok(Some(AccountInfo::default()))
     }
+
     fn code_by_hash(&self, code_hash: B256) -> Result<Bytecode, Self::Error> {
         Ok(self.0.code_by_hash(code_hash)?)
     }
+
     fn storage(&self, address: B160, index: U256) -> Result<U256, Self::Error> {
         Ok(self.0.storage(address, index)?)
     }
@@ -128,7 +132,8 @@ mod tests {
         // insert the modified account info
         db.insert_account_info(address, info);
 
-        // when fetching again, the `AccountInfo` is still `None` because the state of the account is `AccountState::NotExisting`, See <https://github.com/bluealloy/revm/blob/8f4348dc93022cffb3730d9db5d3ab1aad77676a/crates/revm/src/db/in_memory_db.rs#L217-L226>
+        // when fetching again, the `AccountInfo` is still `None` because the state of the account
+        // is `AccountState::NotExisting`, see <https://github.com/bluealloy/revm/blob/8f4348dc93022cffb3730d9db5d3ab1aad77676a/crates/revm/src/db/in_memory_db.rs#L217-L226>
         let info = Database::basic(&mut db, address).unwrap();
         assert!(info.is_none());
     }

crates/evm/src/executor/backend/in_memory_db.rs

@@ -476,7 +476,7 @@ mod tests {
         let s = r#"{
     "meta": {
         "cfg_env": {
-            "chain_id": "0x539",
+            "chain_id": 1337,
             "spec_id": "LATEST",
             "perf_all_precompiles_have_balance": false,
             "disable_coinbase_tip": false,

crates/evm/src/executor/fork/cache.rs

@@ -59,7 +59,7 @@ where
     };
 
     let mut cfg = CfgEnv::default();
-    cfg.chain_id = u256_to_ru256(override_chain_id.unwrap_or(rpc_chain_id.as_u64()).into());
+    cfg.chain_id = override_chain_id.unwrap_or(rpc_chain_id.as_u64());
     cfg.memory_limit = memory_limit;
     cfg.limit_contract_code_size = Some(usize::MAX);
     // EIP-3607 rejects transactions from senders with deployed code.

crates/evm/src/executor/fork/init.rs

@@ -501,7 +501,7 @@ async fn create_fork(
 
     // determine the cache path if caching is enabled
     let cache_path = if fork.enable_caching {
-        Config::foundry_block_cache_dir(ru256_to_u256(meta.cfg_env.chain_id).as_u64(), number)
+        Config::foundry_block_cache_dir(meta.cfg_env.chain_id, number)
     } else {
         None
     };

crates/evm/src/executor/fork/multi.rs

@@ -547,7 +547,7 @@ pub fn apply<DB: DatabaseExt>(
         }
         HEVMCalls::ChainId(inner) => {
             ensure!(inner.0 <= U256::from(u64::MAX), "Chain ID must be less than 2^64 - 1");
-            data.env.cfg.chain_id = inner.0.into();
+            data.env.cfg.chain_id = inner.0.as_u64();
             Bytes::new()
         }
         HEVMCalls::TxGasPrice(inner) => {