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

rename premerge fork to paris, keep premerge as an alias #3615

Merged
merged 6 commits into from
Apr 6, 2022

Conversation

garyschulte
Copy link
Contributor

@garyschulte garyschulte commented Mar 19, 2022

Signed-off-by: garyschulte garyschulte@gmail.com

PR description

rename the merge fork to paris
keep premerge as an alias for paris

Fixed Issue(s)

fixes #3608

Changelog


GenesisConfigFile parisOverAlias =
GenesisConfigFile.fromConfig(
"{\"config\":{\"parisBlock\":10,\"preMergeForkBlock\":11},\"baseFeePerGas\":\"0xa\"}");
Copy link
Contributor

Choose a reason for hiding this comment

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

Change my mind: this should be an error not an override

Choose a reason for hiding this comment

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

There are a number of Genesis files out for kiln and devnet5 that reference the prior fork name. The alias is a way to ease the friction of the change.

I am thinking we should drop it before we merge any of the long lived test nets, possibly before we release 22.1.3. But I would like to make the UX for testers a bit smoother in the interim.

Copy link
Contributor

@shemnon shemnon Mar 20, 2022

Choose a reason for hiding this comment

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

One or the other is fine. We did this with berlin and eip1559. But specifying both should be an error. If you went in to add Paris you should also remove preMergeFork

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah I gotcha. That makes sense. I thought you were referring to just having an alias 👍

Copy link
Contributor

@jflo jflo left a comment

Choose a reason for hiding this comment

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

good test coverage

assertThatThrownBy(() -> dupeOptions.getParisBlockNumber())
.isInstanceOf(RuntimeException.class);

// assert empty in neither are present:
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: s/in/if

Copy link
Contributor Author

Choose a reason for hiding this comment

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

got it 🍻

Copy link
Contributor

@macfarla macfarla left a comment

Choose a reason for hiding this comment

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

LGTM. one tiny nit that I won't be upset about

@garyschulte garyschulte force-pushed the 3608-paris-merge-fork branch from edb3782 to 2811e62 Compare April 6, 2022 14:48
@garyschulte garyschulte enabled auto-merge (squash) April 6, 2022 14:48
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
…throw runtime

Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
@garyschulte garyschulte force-pushed the 3608-paris-merge-fork branch from 2811e62 to 4522748 Compare April 6, 2022 16:17
@sonarqubecloud
Copy link

sonarqubecloud bot commented Apr 6, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

90.9% 90.9% Coverage
3.2% 3.2% Duplication

@garyschulte garyschulte merged commit 89100a0 into hyperledger:main Apr 6, 2022
@garyschulte garyschulte deleted the 3608-paris-merge-fork branch April 6, 2022 16:53
garyschulte added a commit to garyschulte/besu that referenced this pull request Apr 7, 2022
…#3615)

* rename premerge fork to paris, keep premerge as an alias

Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte added a commit to garyschulte/besu that referenced this pull request May 2, 2022
…#3615)

* rename premerge fork to paris, keep premerge as an alias

Signed-off-by: garyschulte <garyschulte@gmail.com>
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
…#3615)

* rename premerge fork to paris, keep premerge as an alias

Signed-off-by: garyschulte <garyschulte@gmail.com>
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.

Rename preMergeFork to paris
5 participants