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.

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

fix: filter out pre-genesis timestamp forks #4501

Merged
merged 3 commits into from
Sep 7, 2023
Merged

Conversation

Rjected
Copy link
Member

@Rjected Rjected commented Sep 6, 2023

This implements the geth fixes ethereum/go-ethereum#27895 and ethereum/go-ethereum#28034 which filter out timestamp forks that have been activated before genesis during fork ID calculation. The geth fixes introduced a test, and a similar test is added here.

@Rjected Rjected added C-bug An unexpected or incorrect behavior A-devp2p Related to the Ethereum P2P protocol A-networking Related to networking in general labels Sep 6, 2023
@Rjected Rjected changed the title fix: filter out pre-genesis timestamps forks fix: filter out pre-genesis timestamp forks Sep 6, 2023
@Rjected Rjected force-pushed the dan/fix-forkids-cancun branch from a460ac9 to ee2eb8b Compare September 6, 2023 22:39
@codecov
Copy link

codecov bot commented Sep 6, 2023

Codecov Report

Merging #4501 (ee2eb8b) into main (6851481) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

Files Changed Coverage Δ
crates/net/eth-wire/src/ethstream.rs 84.17% <100.00%> (ø)
crates/primitives/src/chain/spec.rs 97.10% <100.00%> (+0.50%) ⬆️
crates/primitives/src/forkid.rs 95.29% <100.00%> (+0.09%) ⬆️

... and 9 files with indirect coverage changes

Flag Coverage Δ
integration-tests 16.71% <19.44%> (-0.01%) ⬇️
unit-tests 63.86% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
reth binary 29.71% <ø> (ø)
blockchain tree 83.58% <ø> (ø)
pipeline 90.56% <ø> (ø)
storage (db) 75.06% <ø> (ø)
trie 94.84% <ø> (-0.04%) ⬇️
txpool 47.50% <ø> (ø)
networking 77.41% <100.00%> (-0.03%) ⬇️
rpc 57.45% <ø> (-0.03%) ⬇️
consensus 63.40% <ø> (ø)
revm 31.74% <ø> (ø)
payload builder 6.34% <ø> (ø)
primitives 86.40% <100.00%> (+0.08%) ⬆️

Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

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

nice

@mattsse mattsse added this pull request to the merge queue Sep 7, 2023
Merged via the queue into main with commit 59bffd4 Sep 7, 2023
@mattsse mattsse deleted the dan/fix-forkids-cancun branch September 7, 2023 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-devp2p Related to the Ethereum P2P protocol A-networking Related to networking in general C-bug An unexpected or incorrect behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants