Skip to content

Add check for post merge and don't add difficulty #5236

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

Merged
merged 6 commits into from
Jun 28, 2023
Merged

Add check for post merge and don't add difficulty #5236

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91ae5cd
account for merge
ipatka Jun 28, 2023
c410b7f
overwrite
ipatka Jun 28, 2023
e9fd0dd
fix
ipatka Jun 28, 2023
c50d304
follow naming convention
ipatka Jun 28, 2023
735c211
skip set post merge
ipatka Jun 28, 2023
7311ee4
rustfmt
mattsse Jun 28, 2023
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
12 changes: 11 additions & 1 deletion anvil/src/eth/backend/mem/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,11 @@ impl Backend {
(self.spec_id() as u8) >= (SpecId::LONDON as u8)
}

/// Returns true for post Merge
pub fn is_eip3675(&self) -> bool {
(self.spec_id() as u8) >= (SpecId::MERGE as u8)
}

/// Returns true for post Berlin
pub fn is_eip2930(&self) -> bool {
(self.spec_id() as u8) >= (SpecId::BERLIN as u8)
Expand Down Expand Up @@ -842,7 +847,12 @@ impl Backend {
// update block metadata
storage.best_number = block_number;
storage.best_hash = block_hash;
storage.total_difficulty = storage.total_difficulty.saturating_add(header.difficulty);
// Difficulty is removed and not used after Paris (aka TheMerge). Value is replaced with
// prevrandao. https://github.com/bluealloy/revm/blob/1839b3fce8eaeebb85025576f2519b80615aca1e/crates/interpreter/src/instructions/host_env.rs#L27
if !self.is_eip3675() {
storage.total_difficulty =
storage.total_difficulty.saturating_add(header.difficulty);
}

storage.blocks.insert(block_hash, block);
storage.hashes.insert(block_number, block_hash);
Expand Down