Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use remote chain id in fork metadata #5114

Merged
merged 4 commits into from
Apr 15, 2024
Merged

Use remote chain id in fork metadata #5114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf8b35d
Use remote chain id in fork metadata
fvictorio Apr 12, 2024
3f8b566
Get remote chain id from ForkedBlockchain
fvictorio Apr 12, 2024
d604fe2
Replace unwrap with expect
fvictorio Apr 12, 2024
3d7f13e
Create itchy-maps-film.md
fvictorio Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/itchy-maps-film.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions crates/edr_evm/src/blockchain/forked.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -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()
}
Expand Down
15 changes: 14 additions & 1 deletion crates/edr_provider/src/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,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)
Expand Down Expand Up @@ -2774,6 +2774,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);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok to assume that we are forking mainnet here? I think it is, but would like to get confirmation.

If it's not ok, is there an example of a test where we are doing this "correctly"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We assume this everywhere else in the code, so I think it's fine.


Ok(())
}

#[test]
fn console_log_mine_block() -> anyhow::Result<()> {
let mut fixture = ProviderTestFixture::new_local()?;
Expand Down
Loading