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: set the default hard fork to merge #2087

Merged
merged 4 commits into from
Aug 1, 2022
Merged

Conversation

g11tech
Copy link
Contributor

@g11tech g11tech commented Aug 1, 2022

set the default hard fork to merge

Closes #2015

@codecov
Copy link

codecov bot commented Aug 1, 2022

Codecov Report

Merging #2087 (4d6dc6d) into master (2f9f3ea) will decrease coverage by 0.01%.
The diff coverage is 50.00%.

Impacted file tree graph

Flag Coverage Δ
block 83.81% <ø> (ø)
blockchain 80.54% <ø> (+0.43%) ⬆️
client 78.29% <ø> (-0.05%) ⬇️
common 95.00% <0.00%> (ø)
devp2p 82.66% <ø> (-0.26%) ⬇️
ethash 90.81% <ø> (ø)
evm 40.97% <ø> (ø)
statemanager 84.55% <ø> (ø)
trie 81.35% <ø> (ø)
tx 92.18% <100.00%> (ø)
util 87.22% <ø> (ø)
vm 78.40% <ø> (ø)

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

@gabrocheleau
Copy link
Contributor

Looks good! However some merged-related tests are now failing in merge.spec.ts:

  • 'should mine and stop at the merge (PoA)'
  • 'should mine and stop at the merge (PoW)'

Didn't check in detail but perhaps all that's required is to manually provide a pre-merge HF for those test cases

@g11tech
Copy link
Contributor Author

g11tech commented Aug 1, 2022

thanks @acolytec3 for fixes, got distracted after pushing initial PR 😉

gabrocheleau
gabrocheleau previously approved these changes Aug 1, 2022
Copy link
Contributor

@gabrocheleau gabrocheleau left a comment

Choose a reason for hiding this comment

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

LGTM! 👍🏼

@g11tech g11tech marked this pull request as ready for review August 1, 2022 17:36
@g11tech g11tech merged commit 6967774 into master Aug 1, 2022
@gabrocheleau gabrocheleau deleted the g11tech/default-merge branch August 1, 2022 18:20
@holgerd77
Copy link
Member

Nice, cool, didn't assume this to be so narrowly scoped respectively going through with so few changes. 😀 🤩 Seems Emmett already did a lot of base work here with adding the explicit HF (Common) instantiations in the round before upgrading to London.

Great!

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.

Monorepo: Make Merge Default Hardfork
4 participants