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

chore: Updated fork name from Merge -> Paris #363

Merged
merged 2 commits into from
Jan 18, 2024

Conversation

MukulKolpe
Copy link
Contributor

@MukulKolpe MukulKolpe commented Dec 19, 2023

πŸ—’οΈ Description

Updated Fork name from "Merge" to "Paris" within the repository.

πŸ”— Related Issues

Fixes #362

βœ… Checklist

  • All: Set appropriate labels for the changes.
  • All: Considered squashing commits to improve commit history.
  • All: Added an entry to CHANGELOG.md.
  • All: Considered updating the online docs in the ./docs/ directory.
  • Tests: Included the type and version of evm t8n tool used to locally execute test cases: e.g., ref with commit hash or geth 1.13.1-stable-3f40e65.
  • Tests: Ran mkdocs serve locally and verified the auto-generated docs for new tests in the Test Case Reference are correctly formatted.

Copy link
Member

@marioevz marioevz left a comment

Choose a reason for hiding this comment

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

This looks great, thanks for helping out with this!

There is still an issue with this change and it's that the transition tool, the tool we call to perform the evm execution of the transactions included in the block, it still expects "Merge" when receiving the fork name for Paris.

It would be a bit messy to try to do this with the rest of the code as is right now, mainly because we don't have the code in place to handle such discrepancy, but I've opened this PR #366 that implements exactly that.

I would:

And then we should be able to merge your contribution :)

src/ethereum_test_forks/forks/transition.py Outdated Show resolved Hide resolved
src/ethereum_test_forks/forks/forks.py Outdated Show resolved Hide resolved
@MukulKolpe
Copy link
Contributor Author

MukulKolpe commented Dec 21, 2023

Sounds great! I've incorporated the suggested modifications. Thanks a lot for your help.
Should I add an entry in the CHANGELOG.md?

@marioevz
Copy link
Member

marioevz commented Jan 2, 2024

Hey @MukulKolpe thanks for the changes!
Could you do a couple more things please?

  • Rebase to the latest main branch: There are some conflicts that will need to be solved. Once done, you can force-push to your branch and github should pick it up immediately.
  • Run tox -e framework: There seem to be a couple of failing unit tests at the moment, but could be that they are fixed after the rebase.

@marioevz
Copy link
Member

marioevz commented Jan 3, 2024

Should I add an entry in the CHANGELOG.md?

Yes please!

Copy link
Collaborator

@spencer-tb spencer-tb left a comment

Choose a reason for hiding this comment

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

Thanks for helping out on this :)

All looks good to me - apart from the folder name:

tests/merge/... -> tests/paris/...

And then the changelog!

Copy link
Member

@marioevz marioevz left a comment

Choose a reason for hiding this comment

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

Fantastic! Thank you so much for this!

@marioevz marioevz merged commit 99fb731 into ethereum:main Jan 18, 2024
5 checks passed
@MukulKolpe
Copy link
Contributor Author

Thanks @spencer-tb, @marioevz!!

@MukulKolpe MukulKolpe deleted the fork_names branch January 18, 2024 20:18
@spencer-tb
Copy link
Collaborator

Thanks! @MukulKolpe

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

Successfully merging this pull request may close these issues.

chore: Update the "Merge" fork name to "Paris" within the repo
3 participants