Add check for post merge and don't add difficulty #5236
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattsse
requested changes
Jun 28, 2023
anvil/src/eth/backend/mem/mod.rs
Outdated
Comment on lines
850
to
852
| // 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() { |
Member
There was a problem hiding this comment.
oh yeah, this makes sense.
nice find.
we can simplify this by only using the else branch, we don't need to update the ttd if eip3675
I think it's even debatable if we should increase ttd at all if me mining a block
however this is the first time that this has been raised so I'm ok with increasing it pre merge
Contributor
Author
There was a problem hiding this comment.
sounds good! just made the requested change
Evalir
approved these changes
Jun 28, 2023
Member
Evalir
left a comment
Evalir
left a comment
There was a problem hiding this comment.
very nice catch. With the changes applied this lgtm!
mattsse
approved these changes
Jun 28, 2023
Member
|
btw, just needs |
Member
|
just pushed fmt changes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Post merge TD is set to prevrandao. Anvil was adding prevrandao to fork difficulty causing overflows
Relevant dependency in REVM https://github.com/bluealloy/revm/blob/1839b3fce8eaeebb85025576f2519b80615aca1e/crates/interpreter/src/instructions/host_env.rs#L27
Solution
Check for post merge and don't add difficulty