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

common: handle forkHash on timestamp == genesis timestamp #2959

Merged
merged 3 commits into from
Aug 15, 2023

Conversation

jochem-brouwer
Copy link
Member

@jochem-brouwer jochem-brouwer commented Aug 14, 2023

Fixes:

./hive --sim "ethereum/engine" --client ethereumjs --sim.parallelism 16 --sim.limit="engine-cancun/Request Blob Pooled Transactions"

If fork is at timestamp genesisTimestamp then this fork is supposed to be active at timestamp = 0 and not participate in the forkHash calculation of the devp2p/ETH STATUS message.

See also:

hyperledger/besu#5744
ethereum/go-ethereum#27895
https://eips.ethereum.org/EIPS/eip-6122

@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

Merging #2959 (74c4559) into master (b54a05c) will increase coverage by 0.03%.
Report is 1 commits behind head on master.
The diff coverage is 50.00%.

❗ Current head 74c4559 differs from pull request most recent head 72466f6. Consider uploading reports for the commit 72466f6 to get more accurate results

Additional details and impacted files

Impacted file tree graph

Flag Coverage Δ
block 88.66% <ø> (ø)
blockchain 92.58% <ø> (ø)
client 87.59% <ø> (+0.05%) ⬆️
common 98.56% <50.00%> (-0.10%) ⬇️
ethash ∅ <ø> (∅)
evm 70.43% <ø> (ø)
rlp ?
statemanager 82.98% <ø> (ø)
trie 89.89% <ø> (+0.25%) ⬆️
tx 95.88% <ø> (ø)
util 86.78% <ø> (ø)
vm 79.20% <ø> (ø)

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

Copy link
Contributor

@g11tech g11tech left a comment

Choose a reason for hiding this comment

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

lgtm

@jochem-brouwer jochem-brouwer merged commit 6d283b1 into master Aug 15, 2023
39 checks passed
@holgerd77 holgerd77 deleted the forkhash-genesis-timestamps branch August 15, 2023 07:55
@holgerd77
Copy link
Member

Great find! This is a relatively sensitive change and can have side effects on other girl hash calculations, I would feel better with 1-2 dedicated test cases for it.

@jochem-brouwer
Copy link
Member Author

Yes, you are right, especially these "small" changes can be tested quickly with small tests. I will add tests.

For a general comment though, some hive tests are very complex and would take long to integrate - what we could do (mid-term) is to create a hive CI runner and then run these specific tests to cover these test cases (and for a bonus: also include this into codecov, but that would be complex since we need to hook into hive's docker image of our client)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants