chore: update env chain ID to u64

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

@@ -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()).into();
     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) => {

crates/evm/src/executor/inspector/cheatcodes/env.rs

@@ -94,7 +94,7 @@ impl EvmOpts {
     /// Returns the `revm::Env` configured with only local settings
     pub fn local_evm_env(&self) -> revm::primitives::Env {
         let mut cfg = CfgEnv::default();
-        cfg.chain_id = rU256::from(self.env.chain_id.unwrap_or(foundry_common::DEV_CHAIN_ID));
+        cfg.chain_id = self.env.chain_id.unwrap_or(foundry_common::DEV_CHAIN_ID);
         cfg.spec_id = SpecId::MERGE;
         cfg.limit_contract_code_size = self.env.code_size_limit.or(Some(usize::MAX));
         cfg.memory_limit = self.memory_limit;
@@ -138,7 +138,7 @@ impl EvmOpts {
     /// be at `~/.foundry/cache/mainnet/14435000/storage.json`
     pub fn get_fork(&self, config: &Config, env: revm::primitives::Env) -> Option<CreateFork> {
         let url = self.fork_url.clone()?;
-        let enable_caching = config.enable_caching(&url, env.cfg.chain_id.to::<u64>());
+        let enable_caching = config.enable_caching(&url, env.cfg.chain_id);
         Some(CreateFork { url, enable_caching, env, evm_opts: self.clone() })
     }
 

crates/evm/src/executor/opts.rs

@@ -119,7 +119,7 @@ pub fn apply_chain_and_block_specific_env_changes<T>(
     env: &mut revm::primitives::Env,
     block: &Block<T>,
 ) {
-    if let Ok(chain) = Chain::try_from(ru256_to_u256(env.cfg.chain_id)) {
+    if let Ok(chain) = Chain::try_from(env.cfg.chain_id) {
         let block_number = block.number.unwrap_or_default();
 
         match chain {