Merge pull request #5114 from NomicFoundation/edr/366-hardhat-metadata-fork-id

Use remote chain id in fork metadata

Author: fvictorio

.changeset/itchy-maps-film.md

@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/edr": patch
+---
+
+Fixed a bug in `hardhat_metadata` where the local chain id was being used in the fork metadata

crates/edr_evm/src/blockchain/forked.rs

@@ -89,6 +89,8 @@ pub struct ForkedBlockchain {
     /// The chan id of the forked blockchain is either the local chain id
     /// override or the chain id of the remote blockchain.
     chain_id: u64,
+    /// The chain id of the remote blockchain. It might deviate from chain_id.
+    remote_chain_id: u64,
     network_id: u64,
     spec_id: SpecId,
     hardfork_activations: Option<HardforkActivations>,
@@ -218,13 +220,19 @@ impl ForkedBlockchain {
             remote: RemoteBlockchain::new(rpc_client, runtime),
             state_root_generator,
             chain_id: chain_id_override.unwrap_or(remote_chain_id),
+            remote_chain_id,
             fork_block_number,
             network_id,
             spec_id,
             hardfork_activations,
         })
     }
 
+    /// Returns the chain id of the remote blockchain.
+    pub fn remote_chain_id(&self) -> u64 {
+        self.remote_chain_id
+    }
+
     fn runtime(&self) -> &runtime::Handle {
         self.remote.runtime()
     }

crates/edr_provider/src/data.rs

@@ -2323,7 +2323,7 @@ fn create_blockchain_and_state(
 
         Ok(BlockchainAndState {
             fork_metadata: Some(ForkMetadata {
-                chain_id: blockchain.chain_id(),
+                chain_id: blockchain.remote_chain_id(),
                 fork_block_number,
                 fork_block_hash: *blockchain
                     .block_by_number(fork_block_number)
@@ -2777,6 +2777,19 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn fork_metadata_fork_mode() -> anyhow::Result<()> {
+        let fixture = ProviderTestFixture::new_forked(None)?;
+
+        let fork_metadata = fixture
+            .provider_data
+            .fork_metadata()
+            .expect("fork metadata should exist");
+        assert_eq!(fork_metadata.chain_id, 1);
+
+        Ok(())
+    }
+
     #[test]
     fn console_log_mine_block() -> anyhow::Result<()> {
         let mut fixture = ProviderTestFixture::new_local()?;